chapter 1, 2 and 3
Merge remote-tracking branch 'origin/master'