Fix errors
Merge branch 'master' of https://github.com/CS3249-QWERTY/cs3249-project