Fix
Merge branch 'week4' into gh-pages