remove errors resulting from the previous commit`
Merge branch 'master' of https://github.com/jennli/CPSC410_Group15