first commit
basic structure of folders
fix on grunt watch. watching files only on src
adding bootstra-sass in Gemfile
working on readme.md
Merge branch 'master' of github.com:tiagoamaro/comffee

Conflicts:
	README.md