make SMACSS ready
Merge branch 'master' into SMACSSing

Conflicts:
	stylesheets/style.css
Merge branch 'SMACSSing'