About Color

to gray
Merge branch 'luke-test'

Conflicts:
	.sass-cache/27a9d0831d5c0c6363463541aace27e0cb46e913/main.scssc
	css/main.css
	sass/main.scss