modify attendance page
create print page
modify print page
modify print page
modify print page
modify print page
modify attendance print page
休暇届画面作成中
Merge remote-tracking branch 'origin/transport'

Conflicts:
	app/models/user.rb
	app/views/attendances/index.html.slim
	config/routes.rb
	db/schema.rb
Merge remote-tracking branch 'origin/vacation'

Conflicts:
	app/models/user.rb
	app/views/attendances/index.html.slim
	config/routes.rb
	db/schema.rb
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into transport
add language japanese file
近習
modify attendance page
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into transport
modify minor upgrade
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into transport