Adding chapter 3-4. 4 is still a WIP
Merge remote-tracking branch 'origin/master'