再次修改index.php
Merge branch 'master' of https://github.com/tofutotoro/test

Conflicts:
	index.php