changed definitions
Merge branch 'master' of https://github.com/AprilYu/CS124PA6