the final changes before our presentation
Merge branch 'master' of https://github.com/DemonSparton117/ProjectAppStuff