Stuff
merged stuff
more merging
did stuff
Merge remote-tracking branch 'origin/pr/8'

Conflicts:
	index.html