added some assets, such as converted enemy sprites
Merge branch 'master' of https://github.com/mfbadr/duper-mario into menu
Merge pull request #2 from mfbadr/menu

added some assets, such as enemy gifs converted to sprites
lvl1 change
level change
Merge branch 'mike2' of https://github.com/mfbadr/duper-mario into dennis
lvl1 change2
Merge branch 'mike2' of https://github.com/mfbadr/duper-mario into dennis
tweak coin behavior
added custom webfonts
goomba var dec to main.js
more coins
added level1music
press-start font is working
lvl2
mario boss walks and shoots fire
Merge branch 'master' of https://github.com/mfbadr/duper-mario into dennis

Conflicts:
	public/js/menu.js
added state change on timeout when boss dies
fixed merge conflicts
merge conflicts