Merge pull request #3 from ts7fx/master

hello.
4-15

updated through chapter 6
Merge pull request #8 from guanmei/master

4-15 updates