Merge pull request #6 from xtina-starr/testing

I agree. Pretty sure all the tests are broke.
deleted head from old merge conflict
added fedex
tweaked specs
Merge pull request #7 from xtina-starr/christina-api

Christina api
wrote some specs
committing to pull
Merge branch 'christina-api' of github.com:xtina-starr/shipping_app into testing
controller test passing