Challenge 2 bugfix

Fixed challenge 2 to reflect task, and for consistency between description and code example.
Merge pull request #3 from sritchie73/bugfixes

Challenge 2 bugfix