Finish chapter 6
Merge branch 'master' of https://github.com/lrusli/sample