completed Ch 17 text
updated and started 18
updated
Merge branch 'JLCrandall-master'
includes updates to chapters and begins chapter 18 text