Added collectable items
Merge branch 'develop' of github.com:ggj/ggj14 into develop

Conflicts:
	resources/dungeon.json