Conflicting change.
Deleted title.
Merge branch 'conflict'

Conflicts:
	index.html
Resolved conflict.