ssfdsfsdfsdfsdfsdf
做了部分登录，但是，首页保护不可以
退出码1
Merge branch 'master' of https://github.com/yangbl888/xxbs

Conflicts:
	app/assets/javascripts/login.js
	app/routes.php
	app/views/layout/admin.blade.php
	app/views/layout/front.blade.php
	app/views/login.blade.php