Added lastnames
changed to proper format
Merge branch 'branchII'

Conflicts:
	test.java
added return name
added static