*crosses fingers*
Merge branch 'master' of https://github.com/Stevebel/LD31

Conflicts:
	Assets/Game.unity