Fixed discrepancies between class and code
Merge branch 'master' of https://github.com/jkrepps/CSCE-482