changed css, config, and added grunt task
Merge remote-tracking branch 'origin/master'