added challenge2
Merge branch 'challenge2'