Commit
Fixed title
Merge branch 'feature1'

Conflicts:
	index.html
Updated things