more changes
Merge branch 'master' of https://github.com/AGoodnight/text-adventure

Conflicts:
	js/json/areas.js
	js/json/foes.js
	js/json/items.js