:W
wqMerge branch 'master' of https://github.com/Fanneyyy/hairy-ironman
aa
Merge branch 'master' of https://github.com/Fanneyyy/hairy-ironman
Skil ekkert i thessu
Conflicts:
	.DS_Store
henrietta lattu thetta detta
;DMerge branch 'master' of https://github.com/Fanneyyy/hairy-ironman

Conflicts:
	.DS_Store
	QtPersons.pro
	database.txt