20140930
some changes
some changes2
final version
Merge pull request #21 from Qingxia-Lai/master

ql516 assignment 4 submit