commit homework
commit homework
Merge pull request #32 from cmz2013/master

commit homework