s
Merge branch 'origin/master'

Conflicts:
	HelloWorld.txt
Update HelloWorld.txt
Merge branch 'origin/release-2'