Simplify and correct collider methods
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/sammik/fishinggirl/Collider.java