Update test2.html
Merge branch 'master' into branch1