added custom shipping methods and renamed variables better for undertanding all modifications happen in the catalog/model/shipping/usps file for now unless we add fed ex and others later
Merge branch 'inventory'
Merge branch 'master' of https://github.com/handmdmr46/bikesalvage.com into shipping