午前作業一時コミット
0905午前作業分
レビュー前アップ
Merge branch 'master' of https://github.com/yada-ITA/csc into 09051

Conflicts:
	config/routes.rb
	db/schema.rb
0905最後
Merge branch '09051' of https://github.com/myama2630/csc into myama2630-09051

Conflicts:
	app/controllers/inquiries_controller.rb
	app/views/inquiries/_form.html.erb
	config/routes.rb
	db/schema.rb