add type to every object
Merge branch 'gh-pages' of github.com:cherrry/N-Mario into gh-pages

Conflicts:
	assets/js/NMario/Game.js
Add mushroom die
Add mushroom die
Add Brick Component
Merge branch 'gh-pages' of https://github.com/cherrry/N-Mario into gh-pages
change objects to collide_objects in Game.js:70
add powerup
change power-up to collidable
Mario can kill mushroom now
Merge branch 'gh-pages' of github.com:cherrry/N-Mario into gh-pages
broadcast about collecting mushroom
collect coins
add bouncing when hitting mushroom
Prevent arrow key scrolling. User can press enter to confirm server address and edit player name.
Merge branch 'gh-pages' of github.com:cherrry/N-Mario into gh-pages
add player name onto the player character
move player name to center
fix colliision handling
eat power-up: no effect + change animation sprite