サイドバーにBGに色付け
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	css/main.css
	index.html