Added a paragraph
Added a new paragraph
Merge branch 'new-branch'

Conflicts:
	index.html