Finished Homework 2
Merge pull request #26 from mariannegreat/master

Finished Homework 2