Merge pull request #13 from tvararu/master

Chapter 05s
Merge pull request #15 from tvararu/master

Chapter 06s.
Start work on Chapter 07s. #17