finalized stuff
Merge branch 'master' of http://github.com/KFanPrecalcMan/cmpsc221
finalized stuff