adding two colors to variable.scss
Merge branch 'master' of github.com:BoiseFED/device-registry

Conflicts:
	public/scss/main.scss