buying with stripe
Merge branch 'ld_sales_model'

Conflicts:
	app/views/devise/registrations/new.html.erb