fd
fixed collision methods
Merge branch 'collisionDetection' into change-instructions

Conflicts:
	src/game/FroggrGame.java
	src/sprites/Sprite.java
i think this is it!