Bobby homework
Merge pull request #65 from danvideo/master

Bobby homework