Merge branch 'week-2-dev'
Merge branch 'week-2-dev'
Merge branch 'gh-pages' into week-2-dev
Merge branch 'gh-pages'
edit partially working

The edit partially works.
Merge branch 'week-2-dev'
Merge branch 'master' into gh-pages