Merge branch 'week-4'
Merge branch 'master' into gh-pages