Merge https://github.com/whimsycwd/codebase into assignment6
assignment6.5
Merge pull request #387 from Sorosliu1029/assignment6.5

13307130167_LIUYANG_Assignment6.5