change layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/work_time/show.html.erb
change layout

Conflicts:
	app/views/work_time/show.html.erb