Conflicts:
	app/assets/stylesheets/colors.scss
	app/assets/stylesheets/header.scss