solving merge

Products.java

@@ -653,6 +653,16 @@ public class Products { /* a good class, but not as good as cse391 */
         );
     }
 
+
+    public Product ggsmadhuProduct() {
+        return new Product(
+            "Coca Cola",
+            "Best soft drink",
+            "coke.jpeg",
+            "Coca Cola can",
+            1.50
+        );
+    }
     public Product chetan7() {
             return new Product(
                 "Porche 911",
@@ -673,6 +683,7 @@ public class Products { /* a good class, but not as good as cse391 */
 		"Picture of a lindt milk chocolate package",
 		2.00
 	);
+
 	        }
 
     public Product sprofit() {
@@ -703,5 +714,15 @@ public class Products { /* a good class, but not as good as cse391 */
                             "Electric Heating Pad for Neck and Shoulder",
 			    68.00
                             );
+
+    public Product azitabProduct() {
+	return new Product(
+		"Cinnamon Roll Plushie", 
+		"Giant Cinnamon Roll Plushie", 
+		"cinnamonroll.jpg", 
+		"Picture of Cinnamon Roll Plushie",
+	        500.00
+	);
+
     }
 }

Staff.java

@@ -683,6 +683,15 @@ public class Staff {
         );
     }
 
+     public Employee ggsmadhu(){
+    	    return new Employee(
+		"Madhumitha",
+	       	"Student",
+	       	"Working",
+	       	"mountsi.jpeg",
+	       	"Mount Si"
+	);
+     }
     public Employee chetan7() {
             return new Employee(
                 "Chetan",
@@ -731,6 +740,15 @@ public class Staff {
             "Solana_Beach_bluffs.jpeg",
             "Picture of Solana Beach, San Diego"
         );
+
+    public Employee azitab() {
+	return new Employee(
+		"Azita", 
+		"Student", 
+		"I'm Eating Chocolate Chips", 
+		"hellokitty.jpg",
+		"Hello Kitty"
+	);
     }
 }