minor map changes
Merge branch 'master' of https://github.com/mibewh/seniorProject.git

Conflicts:
	Senior Project/res/map.tmx
	Senior Project/res/map2.tmx