欢迎页不需要导航
Merge branch 'master' of https://github.com/gokuai/yunku-setup

Conflicts:
	app/views/parent/bootstrap.blade.php