type
color
add color sass
fix merge conflicts
merge conflict
Merge pull request #6 from AngelaDiaFazio/color

Color