outstanding homework
Merge pull request #21 from toodelirious/master

outstanding homework