bin
bin from merge
from merge
modifications to makeInventory and InventoryBuilder to accomodate changes in serial number