week3 complete
Merge branch 'master' into gh-pages
completed week3
Merge branch 'master' into gh-pages