Merge pull request #3 from xtina-starr/testing

Testing
not sure
Merge branch 'master' into christina-api
api is working
Merge pull request #4 from xtina-starr/api

api is working!!!
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
commiting to pull
Merge branch 'master' of github.com:xtina-starr/shipping_app into testing
added fedex, probably broke all the tests