I think I'm done.
Merge branch 'master' of https://github.com/JaredBeh/apcsHW