homework 1
Merge pull request #34 from jorkataf/master

homework 1