Merge pull request #62 from gAmUssA/master

minor fixes in ch7
pre-final editing of ch7
refactored ch7, ch8. moved grunt into to appendix_a