Heather Edits 4.4 thru sect 7.1
Merge pull request #296 from andyjohnson/master

Heather Edits 4.4 thru sect 7.1