Added a new Person
Merge origin/master

Conflicts:
	src/gitfirst/GitFirst.java