Add sixth challenge
Merge remote-tracking branch 'upstream/master'
half-assed solution to task 04