commit by 13307130309
Merge pull request #128 from Hermes777/master

13307130309 tangyiqi assignment1