Finished homework 2
Merge pull request #56 from ozziehayz/master

Finished homework 2