restructure finish (hopefully)
Merge branch 'game' of github.com:cherrry/N-Mario into game

Conflicts:
	assets/js/NMario.js
	assets/js/NMario/Component/Land.js