CONFLIXSHUN
Merge branch 'master' of https://github.com/fierydrake/fishinggirl.git

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