added carrierwave
Merge branch 'master' of https://github.com/elliotthilaire/fixmycity