Merge remote-tracking branch 'origin/kevin' into kevin

# Conflicts:
#	src/project/Actor.java

src/project/Actor.java

@@ -18,8 +18,6 @@ public Actor(String name,int age, String gender, String nationality) {
             this.age = age;
             this.gender = gender;
             this.nationality = nationality;
-
-
         }
 
 
@@ -56,9 +54,6 @@ public void setNationality(String nationality) {
         }
 
 
-
-
-
         @Override
         public String toString() {
             String str = "Actor info:[name:"+getName() +", "+"age:"+getAge()+", "+"gender: "+getGender()+", "+"nationality: "+getNationality()+"] \n";