More changes
Merge branch 'master' of https://github.com/ProsserCJ/COMP-441---Southfall