Hot paragraph added
First paragraph added
Merge branch 'experiment'

Conflicts:
	index.html
Heading 2
Placeholder heading
Merge conflict resolve