パンくずリストの追加
Merge branch 'master' of https://github.com/Naba16/design

Conflicts:
	app/views/guidances/show.html.erb
	app/views/users/authorize.html.erb