add xixi
Merge branch 'master' of https://github.com/daixianceng/test

Conflicts:
	index.php