Moar cleaning

derp.
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/css.css