from the trash index.html
index2.html
Merge branch 'master' of https://github.com/damnyip/newGitTest

Conflicts:
	index2.html