fixes 1
Merge branch 'master' of https://github.com/cosc617g4/project