hello branch 2
added more text for merge to master
Merge branch 'second-helloworld-branch'

Conflicts:
	index.html