Initial modify hello.txt in branch 'testCreateNewBranch2'
Merge branch 'testCreateNewBranch' into master

Conflicts:
	testJquery.html ???