Undo
Merge branch 'week3' into gh-pages