about, css
Merge branch 'about,-etc'
Merge branch 'master' of https://eskavich/compas

Conflicts:
	compas/Gemfile