whoo
Merge branch 'master' of https://github.com/Raveler/9deaths

Conflicts:
	data/world.json
	scripts/Game.js