commit by 13307130309
Merge pull request #402 from Hermes777/assignment7

13307130309_tangyiqi_assignment7