commit assignment1
Merge pull request #101 from linchuming/assignment1

13307130255_LINCHUMING_assignment1