hmwk
Merge pull request #43 from smola970/master

homework as of 13 Nov