reworked a bit of stuff..
Merge branch 'master' of http://github.com/CommonAccord/commonaccord

Conflicts:
	assets/custom.css