completed swatches
Merge pull request #7 from katiekatieb/colorView

completed swatches