Merge branch 'master' of github.com:Elizacat/inhumane

Conflicts:
	inhumane/game.py
Merge branch 'master' of github.com:Elizacat/inhumane