commit
Merge branch 'dev' of https://github.com/mfbadr/duper-mario into dennis

Conflicts:
	public/js/lvl1.js
	public/js/menu.js
commit to merge
collect trophy to end lvl2
update effects
Merge branch 'dennis' of https://github.com/mfbadr/duper-mario into mike2
sound fx & lvl2