add new file index.html
add title
add h1
add h2
add ul
Merge branch 'refs/heads/branch1'

Conflicts:
	index.html