Finish exercises chapter 3
Revert "Finish exercises chapter 3"

This reverts commit f1ca7b2d6a11bbb2de66f770c3c578feb1bd26c5.
Merge branch 'develop' into feature/static-pages