Patched up pauses
Merge branch 'master' of https://github.com/esqu1/APCS