first commit ughh:
Merge branch 'master' of https://github.com/tyrelcraig/CPSC310GitLab