Commit eat2
Merge branch 'master' of https://github.com/dg86/TestGithub

Conflicts:
	TestGithub/TestGithub/Test/Person.h