assignment4 commit by 13307130174
Merge pull request #256 from wanyimu/assignment4

13307130174_WanYimu_assignment4