commint in master version
Merge remote-tracking branch 'origin/slave-1'

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