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

Conflicts:
	data/entities.json