Work through up to (and including) Exercise 3.6
Merge remote-tracking branch 'origin/master'