カラー装飾
Merge branch 'colored'

Conflicts:
	css/style.css