modified
Merge branch 'master' of https://github.com/OdinZheng/newGitTest

Conflicts:
	index1.txt