s
Merge branch 'master' of https://github.com/Fanneyyy/hairy-ironman

Conflicts:
	QtPersons.pro.user
txt files for awesome messageees