Getting everything in line to start week 4
Merge branch 'master' into gh-pages
First attempt with themeroller