add fields in person: name, age
Merge branch 'Test'

Conflicts:
	person.txt

deleted fields dad, mom