user2 do some thing
Merge branch 'origin/master'

Conflicts:
	HelloWorld.py