add carrierwave gem for file uploads
merge conflict in home index