add brunch
remove error if brunch doesn't work
Merge pull request #28 from poupotte/master

Add brunch in paas
merge conflict
merge conflict