Trying to cause a merge conflict
Merge branch 'master' of https://github.com/thoffmann2/csci3308-lab3