viewのレイアウトをbootstrapに対応させました
Merge branch 'master' of https://github.com/Naba16/design

Conflicts:
	app/views/events/_form.html.erb
	app/views/guidances_users/_form.html.erb