Merge branch 'master' of https://github.com/sekhat/LudumDare31

Conflicts:
	src/scripts/levels.coffee
Merge branch 'master' of https://github.com/ginja85/LudumDare31