Merge pull request #5 from katiekatieb/colorView

Color view
Merge pull request #6 from katiekatieb/colorView

color view sass
completed swatches