Initial health code
Merge branch 'master' into nhandler-health

Conflicts:
	game/src/enemy.py
	game/src/movement.py
	game/src/state.py