stuff
Merge branch 'master' of github.com:almost/nodeventure

Conflicts:
	world/marksroom.js