homework
Merge pull request #9 from lalogf/master

homework