Merge branch 'master' of github.com:bradpsheehan/daughter_of_store_engine into admin_category_promos
Merge branch 'admin_category_promos' of github.com:bradpsheehan/daughter_of_store_engine into admin_category_promos
all products are updateable for a category
feature spec for category promotions greeen
not totally exploding tests omg added the database cleaner gem / This branch has the whole categories promo feature