color fix

wrong folder last time
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
	sass/colors.sass
	sass/content/contact.sass
	sass/content/iam.sass
	sass/global.sass
	sass/layout/header.sass
	style.css
	style.sass