Created brach test1
Merge branch 'test1'

Conflicts:
	HelloWorld/HelloWorld.cpp