Merge branch 'master' of github.com:lijin-thu/python-tutorial

Former-commit-id: e96daf5
Former-commit-id: 8ec51330983c736e10a58fcda19e472a22505363 [formerly 88d21b61ff9f3cc4154d735cd5dd097872b341ef] [formerly e7ac6ed4c2d0860dfa936e4227dc9e94606f6fba [formerly e403f450893e92331a5a471e9c61dcf405f7fc71]] [formerly 567078816b0cd5121c0d9352c9c039a17491a56b [formerly b63c4fa97fe908f8ed2dadaf2c746d9972c466c4] [formerly 8743b6d8ce37f26f69b3a954259787efcd9796d9 [formerly b67b7ccfb8c932fa9247900ae1ccec8168aaa42d]]] [formerly b67894d49aabd4b5eb86128f76c5733ea3a9598c [formerly 38df0a35c8316016d5a7aa50fbab79319ee17f90] [formerly 879e51a587d58737d98d53d800f7cbe7fb7e523e [formerly 6c8408f4b598c2109c82a0699b5d5ad8a1807669]] [formerly 667afed72a6087734dcefd43a89b6b9e7bcdcf81 [formerly 35ba47436bd01e95d1009ac2c9336eabdf4e72c3] [formerly 4a241b58dd6ccd36d4950e7f414e13768f0da72d [formerly f66322a]]]]
Former-commit-id: 9959930ec3e55a62a5c0b348e9939e0079c03115 [formerly ef8a9f38eb6341bd975b1e2eed1dd5613d215df8] [formerly 51d9224a73ca5ca42c593779d4f570a22d940b8d [formerly 3dd7f0f8b484a1be6c72ba1d91377fcfa56d4a2d]] [formerly e9d883848428ddc71f9c710ddb74b96b829a83b4 [formerly 1c7fc71b7d6bd7a2f4fb56c98eab1d70f11d7977] [formerly 31bc07f03692f03dd2a4bed1640a90c1732deea1 [formerly 96b6e9ffa1558009392693aaa1870a2687a9943c]]]
Former-commit-id: a8804fc7b0cfe0504bc028858d9411bc22fd1ed4 [formerly 17d76e2ea149f67c8c1dd4ac886dbeec91b809ad] [formerly 92be87fa4d1d88e104052eafd8ddcf093f83006b [formerly 6fc5ec317f5c9f54bb9559658a477a0d8510ae65]]
Former-commit-id: 1a678395e04763dde1fcec7c0d8b4988e5003d71 [formerly e3f2376157b8ab6deefc53ed064c0f5f14a833a0]
Former-commit-id: 1f2160f8df1dd7c74e62fc072f4eaa943c3b1102