sane colors
Merge branch 'newcss'

Conflicts:
	stylesheets/default.sass