weh, trying get around wolf's idleness
Merge branch 'master' of https://github.com/AndrejKn/life

Conflicts:
	life.c