Not sure what an scss is or how to run it, but seems like a good idea
Colors
Merge branch 'master' into gh-pages

Conflicts:
	style/main.css