stripe api testing
stripe api test working
merged gemfile conflict