Merge branch 'main' into 'hmantha_staff_page'

# Conflicts:
#   Staff.java

Products.java

@@ -517,4 +517,23 @@ public class Products { /* a good class, but not as good as cse391 */
 	);
 
     }
+
+	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

@@ -539,6 +539,7 @@ public class Staff {
 	);
     }
 
+<<<<<<< Staff.java
 
     public Employee hmantha(){
         return new Employee(
@@ -550,4 +551,15 @@ public class Staff {
         );
     }
 
+
+    public Employee samshar() {
+            return new Employee(
+                "Sami",
+                "Student",
+                "Working hard",
+                "picture.jpg",
+                "Picture of women playing volleyball"
+        );
+    }
+
 }