commit by 13307130309
13307130309_Tangyiqi_assignment1
Merge pull request #175 from Hermes777/assignment1

13307130309_Tangyiqi_Assignment1