small fix to compile
Merge branch 'master' of https://github.com/penguinlver123/cs118-project2
more fixes