Created Color Palette section, updated the layout.jade to make it show so there may be a conflict
Added Color Palette
Merge branch 'colors'
Color palette fix merge conflicts
Add color palette and fix merge conflicts
Merge pull request #5 from mattwojo/colorFix

Color fix