Added proposed edits to Chapter 3.
add section 3 edits, and fix merge conflicts