gemfile
merge conflicts
Merge pull request #3 from BlakeJenningsJohnson/restructure_blake

Restructure blake
Merge branch 'master' of github.com:BlakeJenningsJohnson/shipalot
makes fedex and ups separate api calls