comment out fish, no time to fix, boat collision
Fix boat pos
Merge branch 'master' into gh-pages