sync
Merge branch 'master' of https://github.com/mibewh/seniorProject.git

Conflicts:
	Senior Project/res/map.tmx