Lesson 6 + presentation + Lesson 7
Merge remote-tracking branch 'origin/master'