Merge branch 'main' of gitlab.cs.washington.edu:cse391/24wi/faang into cleahw_staff_page

update wiht the main branch

Products.java

@@ -335,6 +335,24 @@ public class Products { /* a good class, but not as good as cse391 */
                 129.99
         );
     }
+    public Product shen824Product() {
+	return new Product(
+		"Magic Keyboard",
+		"Wireless, Convenience",
+		"keyboard.jpg",
+		"keyboard",
+		99.00
+	);
+    }
+    public Product robertdlProduct(){
+	return new Product(
+		"Sunshower Sam",
+		"Ayo; it's your new best friend! Say hello to Sunshower Sam! (He is alive)",
+		"sunshower.png",
+		"Sunshower Sam",
+		86.79
+	);
+    }
 
     public Product cleahwProduct() {
 	return new Product (

Staff.java

@@ -356,6 +356,24 @@ public class Staff {
                 "Tennis racket and balls"
         );
     }
+    public Employee shen824() {
+	return new Employee(
+		"Yixiang",
+		"Student",
+		"tired",
+		"sea.jpg",
+		"sea"
+	);
+    }
+    public Employee robertdl(){
+	return new Employee(
+		"Robert Luiten",
+		"Vice Assistant Chair of the Faang Executive Money-Making Board.",
+		"I don't really know what my job is and nobody pays me.",
+		"robheadshot.png",
+		"Robert's Professional Headshot"
+	);
+    }
 
     public Employee cleahw() {
 	return new Employee (