added carrierwave gem and associated tests with the beer_label model
Merge pull request #2 from kdurr/add_polymorphic_assoc_feature

added carrierwave gem and associated tests with the beer_label model
fix merge conflicts