Work through Chapter 3
Merge branch 'static-pages'