1

2
Merge branch 'master' of https://github.com/zhbitcxy/thinkphp

Conflicts:
	index.php