Merge branch 'gh-pages'
Merge branch 'gh-pages' into working
Merge branch 'working'
Week Three Initial Commit
Merge branch 'master' into gh-pages