Css update
Merge branch 'master' of https://github.com/chrisgartsen/Declare.git

Conflicts:
	css/custom.css