add sample material column and rewrite inosticID column

qubittool/rowmodel.py

@@ -4,7 +4,10 @@ class RowModel:
         self.coordinate = coordinate
         self.accessionid = accessionid
         self.customerid = None
+<<<<<<< HEAD
         self.materialid = None
+=======
+>>>>>>> d07459290f0590ab07c6c3fdca43ff95ec80057a
         self.plasmavolml = float(0.0)
         self.qubitrunid = None
         self.qubitassay = None
@@ -40,6 +43,7 @@ class RowModel:
 
     def get_customerid(self):
         return self.customerid
+<<<<<<< HEAD
 
     def set_materialid(self, matrlid:str):
         self.materialid = matrlid
@@ -47,6 +51,9 @@ class RowModel:
     def get_materialid(self):
         return self.materialid
 
+=======
+    
+>>>>>>> d07459290f0590ab07c6c3fdca43ff95ec80057a
     def set_qubitassay(self, assay:str):
         self.qubitassay = assay