stuff
Merge branch 'master' of https://github.com/DazKins/LudumDare

Conflicts:
	gfx/sprite.png