[chap2] tweaks to match updates to tutorial prose
Merge branch 'master' into patch-chap2-comp-class-updates
Copyedits: it's -> its; Controller -> controller
Merge pull request #70 from chalin/patch-chap2-comp-class-updates

[chap2] tweaks to match updates to tutorial prose