Merge branch 'master' into working
Merge branch 'working'
Merge branch 'gh-pages'
Final commit week 3, everything working
Merge branch 'master' into gh-pages