Working on admin category promotion
Merge branch 'master' of github.com:bradpsheehan/daughter_of_store_engine into admin_category_promos
Working on admin category promotion
wippage
Merge branch 'admin_category_promos' of github.com:bradpsheehan/daughter_of_store_engine into admin_category_promos

* 'admin_category_promos' of github.com:bradpsheehan/daughter_of_store_engine:
  Working on admin category promotion
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
deleted discount controller spec
finished the category promotion feature / wrestled with gemfile / fixed most feature specs
about to try to rebase master / this commit removed discount spec / modified the categories show
promotions and discounts are all working when you checkout as a guest