commit by 13307130309
Merge pull request #156 from Hermes777/assignment2

13307130309_tangyiqi_assignment2