precompiled assets locally
Merge branch 'master' of github.com:eliza-irene/docket
pushing to heroku
fixing merge conflict
precompiled assests locally
fixed compliing error in app.js