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
fully functioning goombas
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
Merge branch 'menu' of https://github.com/mfbadr/duper-mario into dev
Merge branch 'sprites' of https://github.com/mfbadr/duper-mario into dev
fixed music
level 2 music
style tweak
merge master
bug fixes