Mario can die now :O(
Merge branch 'gh-pages' of github.com:cherrry/N-Mario into gh-pages

Conflicts:
	assets/js/NMario/Player/ControllableMario.js
	assets/js/NMario/Player/Mario.js