Updated Main
Merge branch 'master' of https://github.com/chrisjh/comp426 into a3