added merchant gem
added in stripe-not function yet
deleted spree