change test1.js in branch
change test1.js in master
Merge branch 'vbranch'

Conflicts:
	test1.js