Merge branch 'master' into gh-pages
added week 2 with some css edits
Merge branch 'gh-pages'