修改了一个页面
修改ignore
Merge branch 'master' of https://github.com/gokuai/yunku-setup

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