merged my maste w ryan work to chris2
Merge branch 'master' into chris2
working on editing cart beers but no success yet About to leave GA tes night
commented out email line in create in charges controller to get Stripe on Heroku to wokr
Changed dev rb trying to fix heroku action mailer errors
Tues night late after trying to get up on heroku
with Dylan got the Cart with add and subtract and new routes all fixed up Weds morning
Merge branch 'master' of github.com:rkuhel/lost_tribes3
merged chris2 with all new Dylan cart work into mike Master about to push