deleted title
Merge branch 'New-header'

Conflicts:
	index.html
indenting block
added comment
Merge branch 'Lorem-ipsum-test'
updated links - test
Merge branch 'New-Links'
updated links - test 2
added footer - test 1
Merge branch 'Lorem-ipsum-test'
Merge branch 'New-Links'