gemfile
merge conflicts
Merge branch 'master' of github.com:BlakeJenningsJohnson/shipalot
makes fedex and ups separate api calls
Merge pull request #4 from BlakeJenningsJohnson/restructure_blake

Restructure blake WE DID  IT