fixes
Merge branch 'master' of https://github.com/TheDogg/CCCS310-Project.git