Now you can die
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Scene/combatScene.py
Now you can die