for the other  conflict
Merge branch 'master' of https://github.com/parapontisj/newgittest

Conflicts:
	index.html