Merge branch 'main' into 'rlyons8_staff_page'

# Conflicts:
#   Staff.java

Products.java

@@ -71,6 +71,16 @@ public class Products { /* a good class, but not as good as cse391 */
         );
     }
 
+    public Product akshitasProduct() {
+    	return new Product(
+	    "Lake",
+	    "Pretty lake by the mountains",
+	    "Lake.jpg",
+	    "Image of a snowy lake with moutains in the background",
+	    5.99	    
+	);
+    }
+
     public Product kevluoyrsProduct() {
         return new Product(
             "Blindr",
@@ -380,6 +390,16 @@ public class Products { /* a good class, but not as good as cse391 */
 	);
     }
 
+    public Product siyeeProduct() {
+	return new Product(
+		"Tulips",
+		"Some pretty flowers to make you happier!",
+		"tulips.jpg",
+		"Pink, yellow, purple, and orange tulip flowers in a garden.",
+		49.99
+	);
+    }
+
     public Product lq22Product() {
         return new Product(
                 "Large Fries",
@@ -651,6 +671,16 @@ public class Products { /* a good class, but not as good as cse391 */
         "Picture of Intel Processor",
         589.00
         );
+    } 
+
+    public Product sjeyteProduct() {
+	    return new Product(
+		"AMD Ryzen 7 7800X3D",
+                "Best gaming chip currently!",
+                "7800x3d.jpeg",
+                "Picture of the AMD processor.",
+                449.00
+	);
     }
 
 
@@ -706,6 +736,15 @@ public class Products { /* a good class, but not as good as cse391 */
 	);
     }
 
+    public Product jsun16() {
+            return new Product(
+                            "Massager Heating Pad for Neck and Shoulder",
+                            "Suitable for people to release muscle tension and promote blood flow.",
+                            "Neck_Shoulder_Heating_Pad.jpeg",
+                            "Electric Heating Pad for Neck and Shoulder",
+			    68.00
+                            );
+    }
     public Product azitabProduct() {
 	return new Product(
 		"Cinnamon Roll Plushie", 
@@ -714,6 +753,17 @@ public class Products { /* a good class, but not as good as cse391 */
 		"Picture of Cinnamon Roll Plushie",
 	        500.00
 	);
+
+    }
+    public Product tonywuProduct() {
+        return new Product(
+                "Giant Tree",
+                "Giant Tree, kind of looks weird. Price won't cause floating point error.",
+                "Tree.webp",
+                "Big Tree",
+                15000000000000000000000000000000000000000000001.00
+        );
+
     }
 
     public Product cuteplushie() {

Staff.java

@@ -213,7 +213,16 @@ public class Staff {
         "Alpaca with dandelion hair"
       );
     }
-
+    
+    public Employee akshiam() { 
+      return new Employee(
+	"Akshita",
+	"Student",
+	"Learning",
+	"MountainSunset.jpg",
+	"Husky Winter Sports members watching the sunset on a mountain"
+      );
+    }
     public Employee pbui27() {
       return new Employee(
         "Peter",
@@ -397,6 +406,16 @@ public class Staff {
 	);
     }
 
+    public Employee siyee() {
+    	return new Employee(
+		"Sierra",
+		"Student",
+		"I love plushies",
+		"Bear.jpg",
+		"Brown bear with hearts"
+    	);
+    }
+
     public Employee lq22() {
         return new Employee(
                 "Audrey",
@@ -683,6 +702,16 @@ public class Staff {
         );
     }
 
+    public Employee sjeyte() {
+	    return new Employee(
+		"Sulyman",
+		"Student",
+		"Academic comeback season!",
+		"lebron.jpeg",
+		"Picture of LeBron down 3-1 in the Finals."
+	);
+    }
+    
      public Employee ggsmadhu(){
     	    return new Employee(
 		"Madhumitha",
@@ -732,6 +761,15 @@ public class Staff {
 	);
     }
 
+    public Employee jsun16() {
+        return new Employee(
+            "Jessie",
+            "Student",
+            "Want to minor in Spanish",
+            "Solana_Beach_bluffs.jpeg",
+            "Picture of Solana Beach, San Diego"
+        );
+    }
     public Employee azitab() {
 	return new Employee(
 		"Azita",