Merge branch 'AJ_shark_beatdown' into shark_beatdown
messing with physics
Merge branch 'shark_beatdown' into AJ_shark_beatdown
bird gets bacon

the bird now flies away from the boat after attacking the player or
getting the bacon