commit by 13307130309
Merge pull request #363 from Hermes777/assignment6

13307130309_tangyiqi_assignment6