Edited stylesheet
Merge branch 'master' of https://github.com/jbsmith86/Carbon

Conflicts:
	carbon/static/style.css