week 7 materials
Merge branch 'master' into answers