gem carrierwave added
Merge branch 'master' of github.com:RailsWeek2013/Filmdatenbank
remove duplicate gemfile