initial commit
Merge pull request #351 from foreverXZC/master

13307130057_XiaoZhenchen_Assignment6