Updated application.css to use Sass
added colors.sass
use colour variables
remove link color from theme
move styles from overrides to frontpage.sass
add CTA below main well
remove autogenerated test that we don't need
store secret token in ENV
Merge branch 'master' of ssh://login.powertech.no/~/.git/Kaffesmak.no

Conflicts:
	app/assets/stylesheets/frontpage.css.sass
	app/assets/stylesheets/overrides.sass
	app/views/pages/index.html.slim
Merge branch 'staging'
Merge branch 'master' of ssh://login.powertech.no/~/.git/Kaffesmak.no

Conflicts:
	config/initializers/secret_token.rb
	test/controllers/pages_controller_test.rb
added SECRET_KEY_BASE  to .env-development
added SECRET_KEY_BASE  to .env-development
Merge branch 'master' of ssh://login.powertech.no/~/.git/Kaffesmak.no into staging
No need to fiddle with ENV vars when running tests
Removed empty tests
Merge branch 'staging'
cleanup css mess
remove unused file.
nicer colour for the Velg button