ny constructor
ny constructor
ny constructor og student mapper
Merge origin/master

Conflicts:
	person.txt