index作成中
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into summary_attendance

Conflicts:
	app/views/layouts/_header.html.slim
	config/routes.rb
	db/schema.rb
css消す前
css消す前
消す前
勤務状況作成中
資格手当申請書 作成途中
Merge remote-tracking branch 'origin/spec_n_qa'

Conflicts:
	app/views/layouts/_header.html.slim
	db/schema.rb
Merge remote-tracking branch 'origin/summary_attendance'

Conflicts:
	app/models/user.rb
	app/views/layouts/_header.html.slim