Lec notes and some code to look at.
Merge remote-tracking branch 'upstream/master'