4-17

completed up through chapter 9
Merge pull request #9 from guanmei/master

4-17