Stuff
Merge branch 'master' of https://github.com/PanFriedOctopus/game

Conflicts:
	idk/src/Game.hx
	idk/src/Henchmen.hx