group4 hw2 ver3
Merge pull request #20 from jingfei/master

group4 hw2 ver3