Merge pull request #2 from ds-sww/master

...
Merge pull request #3 from ds-sww/master

~~
Assignment6 completed
Merge pull request #352 from 13307130498/assignment6

13307130498_Huiying Li_Assignment6