mac commit again
Merge branch 'slave-1' of https://github.com/rkzhang/python-learing.git
into slave-1

Conflicts:
	pyton_learning/base/Hello.py