Fishing fixes
Merge branch 'master' of https://github.com/kettle11/Serious-Fishing

Conflicts:
	Assets/IanScene.unity