challenge accepted and complete
Merge pull request #3 from krisleech/master

challenge accepted and complete