Merge branch 'master' of https://github.com/wilbefast/WAT-ld27

Conflicts:
	Source/GameScene.hx
Merge branch 'master' of https://github.com/wilbefast/WAT-ld27