Remove Katie font-family
color view sass
Merge pull request #6 from katiekatieb/colorView

color view sass
Remove Katie testing font
completed swatches
Merge pull request #7 from katiekatieb/colorView

completed swatches
Merge conflict resolve
Merge conflict resolve
fix font file.
added typography stuff
css.map
merge Conflict are kinda my thing