Merge pull request #1 from katiekatieb/chris

Chris
add test
Merge pull request #2 from katiekatieb/katie

add test
added Css font-face demo for Katie, with katie' font
Remove color and type bower components from gruntfile
Remove color and type directories from bower_components directory
Update gitignore -Add #.log to ignore error logs
Update gitignore  to ignore bower_components
Update gitignore with .sass-cache