Merge branch 'chap2-style'
Merge branch 'chap3-style'
Merge branch 'chap4-style'
Merge branch 'chap5-style'
Merge branch 'chap6-style'
Merge branch 'chap7-style'
Merge branch 'misc-style'