Merge branch 'master' of https://github.com/EliAndrewC/magfest
more pycharm stuff
Merge branch 'master' of https://github.com/EliAndrewC/magfest