homework submission
Merge pull request #30 from smola970/master

homework submission