End content
add new content
Merge branch 'new_feature'

Conflicts:
	index.html
Change h1 after merge