some shop shizzle,



my nizzle
stuffff
Merge branch 'master' of https://github.com/fierydrake/fishinggirl.git
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
shopItem and PlayerConfig files
Fixed shop layout
Merge branch 'master' of https://github.com/fierydrake/fishinggirl.git

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