commit assignment5
Merge pull request #299 from linchuming/assignment5

13307130255_LINCHUMING_assignment5