finish chapter 4
Merge branch 'master' of https://github.com/hallfox/teamcc

update locally