updated map
Merge branch 'master' of https://github.com/ryanphillips838/storygame

Conflicts:
	bin/classes.dex
	bin/classes2/com/remnant/story/GameDraw.class
	bin/classes2/com/remnant/story/GameDraw.dex
	bin/classes2/com/remnant/story/GamePlay.class
	bin/classes2/com/remnant/story/GamePlay.dex
	bin/classes2/com/remnant/story/World.class
	bin/classes2/com/remnant/story/World.dex
	bin/resources.ap_