...
Merge COnflicts
Merge branch 'master' of https://github.com/DemonSparton117/ProjectAppStuff
Merge branch 'master' of https://github.com/DemonSparton117/ProjectAppStuff