Umonya/Python-Notes — pull request #7 by elsapet (2013-08-07 20:52:13+00:00)
Title: Fixed merge conflict overwrite of chapters 10 and 11

The correct chapter 10 & 11 file was overwritten in merge https://github.com/Umonya/Python-Notes/commit/ec9dc52393965adfc903258af5dc3b38169d55b0 (fortunately had a backup in another folder, so no git reverts needed :D )
-Richard