Fix stuff
Merge branch 'master' of https://github.com/asiftastos/Life

Conflicts:
	Life.userprefs