edited to cause merge issue in index.html
some more changes
Merge branch 'master' of https://github.com/pioneer903/newTest

Conflicts:
	index.html