FISH - the beginning
Merge branch 'master' of https://github.com/fierydrake/fishinggirl
FISH - Beginning version 2
Merge branch 'master' of https://github.com/fierydrake/fishinggirl

Conflicts:
	src/com/sammik/fishinggirl/Assets.java
	src/com/sammik/fishinggirl/FishingGirlGame.java