some more balancing and reworked combat in progress
Merge branch 'master' of https://github.com/mibewh/seniorProject.git

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