week 4 materials
Merge remote-tracking branch 'upstream/master'