weedSmoke (not working great)
Merge branch 'master' of https://github.com/superjoe30/face-the-music

Conflicts:
	public/text/level.tmx
	src/main.js
Merge branch 'master' of https://github.com/superjoe30/face-the-music

Conflicts:
	src/main.js