テーマ適用分
Merge branch 'branch090601' of https://github.com/myama2630/csc into myama2630-branch090601

Conflicts:
	app/views/layouts/application.html.erb