addedd feature1
Merge branch 'master' into feature1
added some paragraphs
Merge branch 'master' into feature1

Conflicts:
	index.html
Testing and getting confused