Uploading homework
Merge pull request #40 from mikesalv/master

Uploading homework