再送信
Merge branch 'branch1' of https://github.com/7016fuji/csc into 7016fuji-branch1

Conflicts:
	app/views/inquiries/_form.html.erb