add carrierwave for file uploads to projects
edit project.name
fix merge conflicts with day9
fix merge