deleted head from old merge conflict
added fedex
tweaked specs
Merge pull request #7 from xtina-starr/christina-api

Christina api