added CarrierWave code and it's ALMOST working
resolving conflicts