Added test2.html in repo
start a feature
test 3way commit
Merge branch 'test2'