Testing
Merge branch 'master' of https://github.com/AdamVig/SchedU
Trying to fix globals include bug
Fixing merge