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

Conflicts:
	scripts/Monster.js