Jordan Rae's work on exercise 2.  Unfinished.
Merge remote-tracking branch 'origin/master'