commit by 13307130309
Merge pull request #307 from Hermes777/assignment4

13307130309_tangyiqi_assignment4