First ever homework submission
Merge pull request #8 from citizengit/master

First ever homework submission