Cleaned up codebase
Merge branch 'master' of https://github.com/ccmurray93/CSCE452_P2.git