edits
merging remote
simple edits to chapter2
mergin'