Finish chapter 3 on mostly static pages
Merge static pages into master