Merge pull request #4 from ds-sww/master

``
Merge pull request #5 from ds-sww/master

~
Assignment7 completed
Merge pull request #389 from 13307130498/assignment7

13307130498_Huiying Li_Assignment7