毛晚成测试提交
Merge branch 'master' of https://github.com/zengqinglei/PHP-LW.Solution.git
register test
11111
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/UserController.php