assets precompile
Merge remote-tracking branch 'origin/master'
assets precompile
assets precompile
assets precompile
assets precompile
assets precompile
modify
assets precompile
create entry complete page
問い合わせ完了ページ　完成
modify top page news
Merge remote-tracking branch 'origin/inquiry-confirm'
トップデザイン編集中
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into top_design

Conflicts:
	app/assets/stylesheets/style.css.scss
	app/controllers/static_pages_controller.rb
	app/views/static_pages/career_entry.html.slim
	config/routes.rb
トップデザイン編集中２