new title test
testing
New Title 3 @ home
Merge branch 'New-Title'

Conflicts:
	index.html
Fixed the conflicts