Coś
konflikt
Merge branch 'master' of https://github.com/marc-inn/life

Conflicts:
	src/life.pro.user
Testy, testy...