Added to Person
Merge branch 'master' of
https://github.com/Lineaweaver/ActivityApplication.git

Conflicts:
	ActivityApp/src/DomainModel/Person.java
Merge branch 'master' of https://github.com/Lineaweaver/ActivityApplication.git