added percent column to the discounts table and added toggel to discount create
Percent and Dollar Toggle working with coffee script.  Adjusting some formatting on new discount page
Refactoring Cart Calculations with Franklin
fixed merge conflicts