assignment6
Merge pull request #362 from f0rward/assignment6

13307130195_CHENSHAOXIANG_assignment6