New colour Maria
Merge branch 'master' of https://github.com/Iteam1337/iteam-se.docpad

Conflicts:
	docpad.coffee
	src/documents/blogg/index.html.jade
	src/documents/index.html.jade
	src/documents/jobb/index.html.md
	src/documents/medarbetare/sophie.html.md
	src/documents/om/historia.html.jade
	src/documents/om/index.html.jade
	src/documents/om/iteamisiffror.html.jade
	src/documents/om/kontakt.html.jade
	src/documents/vara-tjanster/index.html.jade
	src/styles/style.css.styl