clean up charge.js
resolved merge conflicts with legacy_code branch
removed category and product_categories resources per client request
modified routes file to account for removal of categories and product_categories
added field to users to facilitate credit card requirement
incorporating stripe customer creation logic into User model
a stripe customer object is now being created and added to the user model (through the customer_id) during signup
updated seed file to account for attaching cc info to the signup workflow
added tests to confirm credit card is being saved on user signup
moved stripe validation logic from signup form to model to give users the option of adding credit card information during signup
fixed failing controller tests
all non-stripe related code in users model tested
fixed merge conflicts with most recent version of origin/master
credit card feature in profile section in process
update to db schema
fixed merge conflicts
added the ability for users to edit credit card information in profile section, all tests green
commented out buggy search spec tests, DannyG working on resolving that issue
Fixed merge conflicts