initial commit
Merge pull request #8 from lisaharvey/master

homework