Add Person class
Merge remote-tracking branch 'origin/dev_1.0'

Conflicts:
	test.txt