Merge remote-tracking branch 'origin'
業務報告書を作成
Merge remote-tracking branch 'origin/vacation_n_bizrepo'

Conflicts:
	app/assets/stylesheets/style.css.scss
	config/routes.rb
	db/schema.rb
	lib/tasks/sample_data.rake