Fixed merge conflict overwrite of chapters 10 and 11
Merge pull request #7 from elsapet/master

Fixed merge conflict overwrite of chapters 10 and 11