.
Merge branch 'master' of https://github.com/tom2015/learnPython

Conflicts:
	14_1228.py