venn diagram
Merge branch 'master' of github.com:jbunting/pinch-app

merging
Merge branch 'master' of github.com:jbunting/pinch-app

Merged
config.rb for compass watch (sass)