Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
completed week 3
Merge branch 'gh-pages'