homework2,3
Merge pull request #187 from panxunying/master

homework2,3