Trying to fix a bug
Merge branch 'master' of https://github.com/Jam-Craft/ChowTime