add cost estimator
ready to merge to master
Revert "fix cost estimator conflicts"

This reverts commit 189388f9f8c617f0957d11ea2e4b73faeca1449f.
Revert "clean pull from heroku"

This reverts commit aba51c95ab4cb730b3766623a7e3b9a285915457.
Merge branch 'cost-estimator'
push to remotes