Finish challenge 1
Merge pull request #1 from ianks/master

Finish challenge 1