adding color variables
Merge remote-tracking branch 'origin/master'

Conflicts:
	styles/our-styles/_variables.scss
Merge branch 'master' of https://github.com/gilsondesign/insight-wp-theme