modify index2.php (testGit3)
Merge branch 'master' of https://github.com/shemilly/test_repo

Conflicts:
	index2.php