Should have merge problems
Merge branch 'master' of https://github.com/Farzadd/cpsc310