Finish exercises chapter 3
Merge branch 'develop' into feature/static-pages