Code cleansing.
Merge branch 'master' of https://github.com/nickmealey/css-core-architecture

Conflicts:
	colors/css/styles.css