Merge branch 'main' into 'rlyons8_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 kevinh33Product() {
 	    return new Product(
 			    "Duolingo owl",
@@ -765,15 +788,13 @@ public class Products { /* a good class, but not as good as cse391 */
         );
 
     }
-
-    public Product cuteplushie() {
-        return new Product(
-             "Meowchi",
-             "A cute neko plush",
-             "meowchi.jpeg",
-             "Picture of meowchi plush",
-              15.99
+    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
 	);
-     }
-
+    }
 }

Staff.java

 public class Staff {
+
+   public Employee boschen() {
+   	return new Employee(
+		"Boshan Chen",
+		"Sleeper",
+		"Sleep and stare blankly",
+		"White.jpg",
+		"umm.."
+	);
+   }
+
 	
+   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",
@@ -779,18 +799,23 @@ public class Staff {
 		"Hello Kitty"
 	);
     }
-	
-
-public Employee rlyons8() {
-	return new Employee(
-			"Rayana",
-			"Student",
-			"Future Cat Lady",
-			"animegeek.jpeg",
-			"Black Anime Girl" 
- 	);
+    public Employee tonywu() {
+       return new Employee(
+           "Tony",
+           "Student",
+           "Student in CSE",
+           "NormanRockwell.jpg",
+           "Norman Rockwell Self-Portrait"
+       );
+   }
+    public Employee pranavnt() {
+        return new Employee(
+                "Pranav",
+                "Student",
+                "i like celsius",
+                "celsius-picture.png",
+                "celsius picture"
+        );    
     }
-
-}
-
+}