それなりに変えました
Merge commit 'ebbfaa4eb71455a21a70c332e8feda2142240cb8' into input_design

Conflicts:
	app/views/wines/_form.html.erb
おえた
Merge pull request #44 from Mulyu/input_design

お　ね　が　い