fix bugs (health bar, collision detection)
Merge remote-tracking branch 'origin/master'

Conflicts:
	Game/Game.py
	Game/Unit.py
fix bugs (health bar, collision detection)
Merge branch 'master' of https://github.com/DChaushev/Facebookland