change index file - testing branch merge conflict resoluting
Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
	index.html