finished homework
Merge pull request #27 from kevinmcalear/master

finished homework