Merge remote-tracking branch 'origin/log'
dedup and buttons
adding lodash to package
Merge branch 'master' of heroku.com:ebola