lots of changes including a shop
Merge branch 'master' of https://github.com/fierydrake/fishinggirl.git