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

Testing