Merge branch 'gh-pages'
final commit for week 3
Merge branch 'master' into gh-pages