reenabled strong parameters
removed holiday promotion from config/application.rb only. still need to remove from views
Merge branch 'remove-holiday-promo'
disabled strong params again and put back holiday promo
completed carrierwave feature