公司电脑提交
mac commit
Merge branch 'slave-1' of https://github.com/rkzhang/python-learing.git
into slave-1

Conflicts:
	pyton_learning/base/Hello.py
台机提交
mac commit again
Merge branch 'slave-1' of https://github.com/rkzhang/python-learing.git
into slave-1

Conflicts:
	pyton_learning/base/Hello.py
Merge remote-tracking branch 'origin/slave-1'

Conflicts:
	pyton_learning/base/Hello.py