have functioning carrierwave without tests
added index.html.erb to beer_label model
removed records in db and added uploads file to gitignore
merge fixes
fix merge issues