Update test2.html
Merge remote-tracking branch 'cloud/master' into newbranch

Conflicts:
	test2.html