no message
Merge branch 'master' of https://github.com/DreamShowAdventures/LudumDare29

Conflicts:
	assets/bunny.png
Merge branch 'master' of https://github.com/DreamShowAdventures/LudumDare29

Conflicts:
	assets/gems.png