added some colliders to the fish, they are in the wrong positions
though.
Merge branch 'master' of https://github.com/fierydrake/fishinggirl.git
Colliders to Fish and Large Fish
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/sammik/fishinggirl/FishingGirlGame.java
	src/com/sammik/fishinggirl/Water.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/sammik/fishinggirl/FishingGirlGame.java
Added the mouth position to the Fish super class..
Added eat colliders to the mouths of all fishies
Changed how collider works, so it uses polygons now to allow for any
shape
Changed all types of colliders on the fish to be the polygon colliders
simply refactored some collision detection with clicking and the shop
changed types of colliders to fit with the new polygon colliders
updated to fit with new colliders
Merge branch 'master' of https://github.com/fierydrake/fishinggirl.git

Conflicts:
	src/com/sammik/fishinggirl/FishingGirlGame.java
	src/com/sammik/fishinggirl/shop/Shop.java