Merge branch 'master' of github.com:pdt256/shipping
Conflicts: src/Fedex/Rate.php src/UPS/Rate.php src/USPS/Rate.php tests/ShipTest.phppull/3/head
commit
b911e8923d
Conflicts: src/Fedex/Rate.php src/UPS/Rate.php src/USPS/Rate.php tests/ShipTest.phppull/3/head