Merge pull request #1 from xtina-starr/christina-api

Christina api
Merge pull request #2 from xtina-starr/christina-api

Christina api
Added spec folder
Merge branch 'master' of github.com:xtina-starr/shipping_app
wrote one working mock test, and one non-working remote test
Merge pull request #3 from xtina-starr/testing

Testing
not sure
Merge branch 'master' into christina-api
specs with mock
changed ups parsed shipping to be a hash
didn't use