commented out validations for simple understanding of user model
pulled down the changes from upstream
Added stripe gem and ran bundle install
created migration to add customer id to users table
added dot-env rails gem, ran bundle install, and added stripe initializer file
Added stripe-rails gem and initialize stripe variables in stribe.rb file
fixed inheritenace of controllers
removed the email validation for development purposes
ran rails g controller charges
added charge routes, add create and new methods to charges controller
now create method can create customer and charge them, configured my api keys in stripe initializer
pulled stuff from upstream
fixed merge issues
removed charges controller
pulled changes from upstream master
Merge branch 'master' of github.com:CCHBobsBagles/CCHBobsBagelsAPI into stripe_prototype
Add in render of order_item_options in order index and show views.
Merge pull request #15 from HollyM021980/deep_nested_jbuilder_order_views

Add in render of order_item_options in order index and show views.
changed json view, updated orders in schema
Merge pull request #16 from cyurtbil/stripe_prototype

Updates to the order object