hopefully fixed mo issues
Merge branch 'master' of https://github.com/Gamehendge/The-Phishbowl