add a line
added a new home.html
change title and added a new paragraph.
Merge branch 'release1' to master

Conflicts:
	test.html