initial commit
Merge pull request #385 from foreverXZC/master

13307130057_XiaoZhenchen_Assignment7