- putting in colors. Names will need to change
Merge remote-tracking branch 'origin/master'

Conflicts:
	scss/color.scss