homework
Merge pull request #1 from liaolushen/master

homework