text-align right on cart total, cart show.
resolved merge conflict
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