works up examples from lab 2014-02-07
finishes chapter 8
fixes merge conflicts