assignment5.5 commit by 13307130174
Merge pull request #337 from wanyimu/assignment5.5

13307130174_WanYimu_assignment5.5