Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into entry
modify layout
a
社員紹介ページのスライドを修正する
research orbit slider
modify toppage-slide
キャリアエントリー編集
キャリアエントリー編集
Merge remote-tracking branch 'origin/entry'

Conflicts:
	app/views/static_pages/recruit.html.slim
入力内容確認ページ作成中
Merge remote-tracking branch 'origin/inquiry-confirm'

Conflicts:
	app/views/static_pages/home.html.slim
	config/routes.rb