added carrierwave
fixed merge conflicts