this is my commit for homework
Merge pull request #5 from ckn220/master

Colin's Pull Request - 1st HW Assignment