Merge branch 'main' into 'shangy24_staff_page'

# Conflicts:
#   Products.java
#   Staff.java

Products.java

 /* check out these products! */
 public class Products { /* a good class, but not as good as cse391 */
+
+    public Product boschenProduct() {
+	return new Product(
+		"sleepCoke",
+		"It will help you a nice sleep",
+		"sleepCoke.jpg",
+		"really good, has sleepy coffine",
+		9.98	
+		);
+    }
+
     
+
+    public Product benoreProduct() {
+	    return new Product(
+			    "Taylor Swift - Folklore Vinyl",
+			    "A vinyl containing the deluxe edition of Taylor Swift's Grammy-winning FFolklore album.",
+			    "folkloreac.png",
+			    "The album cover for Taylor Swift's folklore album.",
+			    29.99
+			    );
+    }
+
+    public Product ekimji1Product() {
+	return new Product(
+		    "Gudetama",
+	    	"perfect",
+		    "gudetama.jpg",
+		    "Lazy egg",
+		    1000.0
+		    );
+    }
+
     public Product kevinh33Product() {
 	    return new Product(
 			    "Duolingo owl",
@@ -71,6 +103,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",
@@ -661,6 +703,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
+	);
     }
 
 
@@ -735,14 +787,23 @@ public class Products { /* a good class, but not as good as cse391 */
 	);
 
     }
-
-    public Product shangy24Product() {
+    public Product tonywuProduct() {
         return new Product(
-            "Windows 10 Pro",
-            "An operating system made by Microsoft",
-            "win10.jpg",
-            "Windows 10 Default Wallpaper",
-            199.99
+                "Giant Tree",
+                "Giant Tree, kind of looks weird. Price won't cause floating point error.",
+                "Tree.webp",
+                "Big Tree",
+                15000000000000000000000000000000000000000000001.00
         );
+
+    }
+    public Product pranavntProduct() {
+	return new Product(
+		"Celsius Essentials 1000 pack",
+		"1000 pack of celsius essentials. will keep you awake.",
+		"celsius-picture.png",
+		"Celsius Essentials",
+		1000.0
+	);
     }
 }
\ No newline at end of file

Staff.java

 public class Staff {
+
+
+   public Employee boschen() {
+   	return new Employee(
+		"Boshan Chen",
+		"Sleeper",
+		"Sleep and stare blankly",
+		"White.jpg",
+		"umm.."
+	);
+   }
+   public Employee ekimji() {
+	   return new Employee(
+		"Esther",
+		"student",
+		"local point demon",
+		"gudetama.jpg",
+		"gudetama with balloon"
+	);
+   }
 	
+   public Employee benore() {
+	   return new Employee("Ben",
+			   "Student",
+			   "Computer Science student",
+			   "benore.jpg",
+			   "Picture of Ben Oreizy");
+   }
+	
+
    public Employee cuperido() {
        return new Employee(
            "Young You",
@@ -213,7 +242,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",
@@ -693,6 +731,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",
@@ -760,15 +808,23 @@ public class Staff {
 		"Hello Kitty"
 	);
     }
-
-    public Employee shangy24() {
+    public Employee tonywu() {
+       return new Employee(
+           "Tony",
+           "Student",
+           "Student in CSE",
+           "NormanRockwell.jpg",
+           "Norman Rockwell Self-Portrait"
+       );
+   }
+    public Employee pranavnt() {
         return new Employee(
-            "Shangzhen Yang",
-            "Student",
-            "Hello, World!",
-            "your-name.jpg",
-            "Wallpaper of Movie Your Name"
-        );
+                "Pranav",
+                "Student",
+                "i like celsius",
+                "celsius-picture.png",
+                "celsius picture"
+        );    
     }
 }