fixing bug
Merge branch 'master' of github.com:bertramdev/coffee-asset-pipeline