Collision detection updates
collision update

Conflicts:
	src/Player.java