commit by 1330730309
Merge pull request #347 from Hermes777/assignment6

13307130309_tangyiqi_assignment6