Changed challenge definition and solution to contain less text.
Merge remote branch 'origin/master'