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