text2
Merge branch 'master' of https://github.com/wanghj966/pyCookbook

Conflicts:
	pyCookbook/.settings/org.eclipse.core.resources.prefs
text2