not sure
Merge branch 'master' into christina-api
specs with mock
changed ups parsed shipping to be a hash
didn't use
merge conflicts
Update shipping_controller.rb

removed merge conflict leftovers
Update shipping.rb
Merge pull request #5 from xtina-starr/christina-api

Christina api