Revert "Merge branch 'master' into develop"

This reverts commit d7628d947abd324d5f7c05fb46e0c256f93b7424, reversing
changes made to 6117873ef1dd7d0f41396ac2b499391393110d9f.
Preparation instructions for the second challenge