even MORE edits
Merge branch 'master' of https://github.com/Jackfrost04/CMPT308