first commit
Merge branch 'master' of https://github.com/Fanneyyy/hairy-ironman into thorri-test

Conflicts:
	main.cpp
	person.cpp
Merge pull request #11 from Fanneyyy/thorri-test

Thorri test :)