Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
フォーム確認画面バグ修正
Merge remote-tracking branch 'origin/bug'

Conflicts:
	app/assets/stylesheets/style.css.scss