Merge pull request #1 from ds-sww/master

~
Assignment2 completed
Merge pull request #290 from 13307130498/Assignment_2

13307130498_LiHuiying_Assignment 2