update for chapter 6 and 12
Merge branch 'master' of https://github.com/lithand/scala