made a change
Merge branch 'master' of https://github.com/jacksun101/newGitTest

Conflicts:
	index2.html
This is really important change.