Syncing to the latest changes from UltimateFishbot

I might be a GitHub newbie to do it this way, but at least it should work.