Change done exclusively to generate a merge conflict
Merge remote-tracking branch 'origin/conflict-branch' into gh-pages

Conflicts:
	index.html