somewhat fixed collision detection with moving map

still buggy
Merge branch 'master' of https://github.com/Childplay534/CSGame

Conflicts:
	Map.class
	Player.class
	project.greenfoot