unepwcmc/carbon-benefits — pull request #15 by th3james (2012-03-28 07:13:32+00:00)
Title: Add polygon model merge fixed

For some reason, after Simao removed the cartodb config file, both agnieszka's and my local branches come up as being 190 commits behind, with merge conflicts. This branch seems fixed to me, but still claims to be many commits ahead, Simao could you confirm it's good and merge?

Cheers