Updated to what is working and going to be sent out to CCC
Merge branch 'master' of https://github.com/aPotato/Lab5