made a change
made other changes(master)
Merge branch 'testing'

Conflicts:
	index.html
Change index.html after branch,merge