wip
started Category Promotions
Merge branch 'category_promo' of github.com:bradpsheehan/daughter_of_store_engine
made the admin category promo safe on master / will need a rake db migrizzle
Working on admin category promotion
text-align right on cart total, cart show.
resolved merge conflict
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
minor typo fix
all products are updateable for a category
feature spec for category promotions greeen
added percent column to the discounts table and added toggel to discount create
not totally exploding tests omg added the database cleaner gem / This branch has the whole categories promo feature
deleted discount controller spec
Percent and Dollar Toggle working with coffee script.  Adjusting some formatting on new discount page
finished the category promotion feature / wrestled with gemfile / fixed most feature specs