Added a Person
Merge origin/master

Conflicts:
	src/javaapplication101/JavaApplication101.java