Finished in class...kind of
Merge branch 'master' of github.com:caitlinstanton/apcshomework