Merge branch 'main' into 'mbalak_staff_page'

# Conflicts:
#   Products.java

Products.java

@@ -505,6 +505,35 @@ public class Products { /* a good class, but not as good as cse391 */
             "BigMac.jpeg",
             "image of Big Mac",
             5
+		);
+	}
+
+    public Product ccsekhar20Product() {
+	    return new Product(
+		"Coffee",
+		"Good coffee",
+		"coffee.jpeg",
+		"Picture of coffee",
+		4.99
+	);
+    }
+
+	public Product samsharProduct() {
+	    return new Product(
+		"Spray Ketchup",
+		"Ketchup that you can spray on",
+		"ketchup.jpg",
+		"Example image of spray on ketchup",
+		4.99
+	);
+    }
+	public Product SprayKetchup() {
+        return new Product(
+            "SprayKetchup",
+            "Spray on Ketchup",
+            "ketchup.jpg",
+            "An image of what a spray on ketchup bottle would look like",
+            5.99
         );
     }
 }

Staff.java

@@ -538,4 +538,24 @@ public class Staff {
             "Picture of a dog"
         );
     }
+
+    public Employee ccsekhar20() {
+	    return new Employee(
+		"Chaitanya",
+		"Student",
+		"On the grind",
+		"ocean.jpg",
+		"Picture of the ocean"
+	);
+    }
+
+    public Employee samshar() {
+            return new Employee(
+                "Sami",
+                "Student",
+                "Working hard",
+                "picture.jpg",
+                "Picture of women playing volleyball"
+        );
+    }
 }