model classes
Merge branch 'master' of https://github.com/fjoseph1313/Aladdin.git

Conflicts:
	src/main/java/aladdin/com/model/Person.java