Fixed more erros
Merge branch 'master' of https://github.com/amwoods3/CISS465Project