choose game world
Merge branch 'master' of github.com:cherrry/Node-Mario

Conflicts:
	server.js
	world/w1.js
Merge branch 'master' of github.com:cherrry/Node-Mario