Revert "Merge branch 'master' of https://github.com/trudeaujt/CSCD454Final"

This reverts commit ad7914fca1e5aebf781bd110691629fd8fa775a0, reversing
changes made to ee379efbfe40edc79bbec1906382ee6905cd4bf5.