Added carrierwave back for bootsy
Add carrierwave back for bootsy
clean merge conflict
CSS and home text