display function edited
Merge branch 'master' of https://github.com/moderndaymoron/PersonCSci

Conflicts:
	personrepository.cpp