before braintree removal
added stripe stuff
added stripe more and added subtotal column to orders
went back to other views
commit before bed
added storefront model
added storefronts controller
added storefronts controller and view templates
finished initial addition of storefronts
orphan record prevention & handling
Merge branch 'master' of https://github.com/blackjacket401/zertica-changed

Conflicts:
	app/models/ability.rb
	db/schema.rb