Shipping Method sorted
Merge branch 'master' of https://github.com/obates/yoyoSpree

Conflicts:
	yoyoburger/db/development.sqlite3
	yoyoburger/log/development.log
	yoyoburger/tmp/cache/04D/1B1/spree%2Fapp_configuration%2Fattachment_url
	yoyoburger/tmp/cache/0A7/1C1/spree%2Fapp_configuration%2Fintercept_email
	yoyoburger/tmp/cache/0A7/991/spree%2Fapp_configuration%2Fattachment_path
	yoyoburger/tmp/cache/132/791/spree%2Fapp_configuration%2Fdisplay_currency
	yoyoburger/tmp/cache/17E/D61/spree%2Fapp_configuration%2Fdefault_seo_title
	yoyoburger/tmp/cache/19E/B51/spree%2Fapp_configuration%2Fattachment_styles
	yoyoburger/tmp/cache/1F6/2D1/spree%2Fapp_configuration%2Fdefault_country_id
	yoyoburger/tmp/cache/2C4/E81/spree%2Fapp_configuration%2Fallow_ssl_in_staging
	yoyoburger/tmp/cache/315/761/spree%2Fapp_configuration%2Fcurrency_decimal_mark
	yoyoburger/tmp/cache/334/AA1/spree%2Fapp_configuration%2Fdefault_meta_keywords
	yoyoburger/tmp/cache/37E/D31/spree%2Fapp_configuration%2Fcheck_for_spree_alerts
	yoyoburger/tmp/cache/391/421/spree%2Fapp_configuration%2Fattachment_default_url
	yoyoburger/tmp/cache/41E/2B1/spree%2Fapp_configuration%2Fallow_ssl_in_production
	yoyoburger/tmp/cache/460/D81/spree%2Fapp_configuration%2Fdefault_meta_description
	yoyoburger/tmp/cache/46F/D51/spree%2Fapp_configuration%2Fattachment_default_style
	yoyoburger/tmp/cache/4A6/7A1/spree%2Fapp_configuration%2Fcurrency_symbol_position
	yoyoburger/tmp/cache/645/811/spree%2Fapp_configuration%2Fcurrency_thousands_separator
	yoyoburger/tmp/cache/82B/2B1/spree%2Fapp_configuration%2Fallow_ssl_in_development_and_test
	yoyoburger/tmp/cache/CC4/C20/spree%2Fapp_configuration%2Fuse_s3
	yoyoburger/tmp/cache/DD9/320/spree%2Fapp_configuration%2Fsite_url
	yoyoburger/tmp/cache/DDD/2D0/spree%2Fapp_configuration%2Fcurrency
	yoyoburger/tmp/cache/DF5/3C0/spree%2Fapp_configuration%2Fs3_bucket
	yoyoburger/tmp/cache/DFD/670/spree%2Fapp_configuration%2Fs3_secret
	yoyoburger/tmp/cache/E27/320/spree%2Fapp_configuration%2Fsite_name
	yoyoburger/tmp/cache/E69/490/spree%2Fbackend_configuration%2Flocale
	yoyoburger/tmp/cache/E88/D80/spree%2Fapp_configuration%2Fhide_cents
	yoyoburger/tmp/cache/EE9/350/spree%2Fapp_configuration%2Fs3_protocol
	yoyoburger/tmp/cache/F01/FD0/spree%2Ffrontend_configuration%2Flocale
	yoyoburger/tmp/cache/F91/890/spree%2Fapp_configuration%2Fs3_access_key
	yoyoburger/tmp/cache/assets/development/sprockets/4707026bae937760dfc2f6c197b0341d
	yoyoburger/tmp/cache/assets/development/sprockets/7310b9a8b178973ea91c7886c2a48044
	yoyoburger/tmp/cache/assets/development/sprockets/7ac548254a01967934fae84bb7898ed0
	yoyoburger/tmp/cache/assets/development/sprockets/a027bb90b4432f43e0bcb2fc4040deff
	yoyoburger/tmp/cache/assets/development/sprockets/afaf8c23f4c2cc2828151ef1b9ed966f
	yoyoburger/tmp/cache/assets/development/sprockets/f31811cf5d0047da97e0613dec77ee33
	yoyoburger/tmp/cache/assets/development/sprockets/ffea4534b0e6e8129d46be7cd2a569f2
Db stuff
Db stuff
Merge branch 'master' of https://github.com/obates/yoyoSpree

Conflicts:
	.DS_Store
	yoyoburger/.DS_Store
	yoyoburger/db/development.sqlite3
	yoyoburger/log/development.log