More Map Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/battle/Battle.class
	bin/com/pewpy/pewp/Game.class
	bin/com/pewpy/pewp/entity/mob/Mob.class
	bin/com/pewpy/pewp/entity/mob/Player.class
	bin/com/pewpy/pewp/graphics/Screen.class
	bin/com/pewpy/pewp/graphics/Sprite.class
	src/com/pewpy/pewp/entity/mob/Player.java