test again
Merge branch 'master' of https://github.com/nealzhang123/neal_studying_thinkphp

Conflicts:
	Tpl/Home/Index/index.html