Finally actually totally fixed logic
Merge branch 'master' of github.com:AaronMorton/Sorry_SoftwareEngineering