Merge branch 'master' of https://github.com/hammer/python-guide