Merge branch 'main' into 'shangy24_staff_page'

# Conflicts:
#   Staff.java

Products.java

@@ -13,6 +13,16 @@ public class Products { /* a good class, but not as good as cse391 */
 
     
 
+    public Product smayanProduct() {
+        return new Product(
+                "Dollar Bill",
+                "one dollar in cash",
+                "dollar_bill.jpg",
+                "Image of a one-dollar bill",
+                1.00
+                );
+    }
+
     public Product benoreProduct() {
 	    return new Product(
 			    "Taylor Swift - Folklore Vinyl",
@@ -31,8 +41,19 @@ public class Products { /* a good class, but not as good as cse391 */
 		    "Lazy egg",
 		    1000.0
 		    );
+
     }
 
+       public Product bohanz04Product() {
+            return new Product(
+                            "CSE351 hw problem",
+                            "A confusing problem faced",
+                            "test2.jpg",
+                            "image of that problem",
+                            1.00
+                            );
+    }
+ 
     public Product kevinh33Product() {
 	    return new Product(
 			    "Duolingo owl",
@@ -807,6 +828,16 @@ public class Products { /* a good class, but not as good as cse391 */
 	);
     }
 
+	public Product acuraIntegra() {
+        return new Product (
+            "Acura Integra",
+            "Acura Integra",
+            "acura.jpg",
+            "Acura Integra",
+			52400
+		);
+	}
+	
     public Product shangy24Product() {
         return new Product(
             "Windows 10 Pro",

Staff.java

 public class Staff {
 
 
+    public Employee smayan(){
+           return new Employee(
+                           "Smayan Nirantare",
+                           "CS Student",
+                           "I'm hungry",
+                           "travis_scott.jpg",
+                           "Travis Scott"
+                           );
+   }
+
+
    public Employee boschen() {
    	return new Employee(
 		"Boshan Chen",
@@ -29,6 +40,16 @@ public class Staff {
    }
 	
 
+   public Employee bohanz04() {
+        return new Employee(
+	    "Bryan Zhao",
+	    "Student",
+	    "abcdefg stuff",
+	    "test1.jpg",
+	    "hope to get internship"
+	);
+   }	   
+
    public Employee cuperido() {
        return new Employee(
            "Young You",
@@ -827,13 +848,13 @@ public class Staff {
         );    
     }
 
-    public Employee shangy24() {
-        return new Employee(
-            "Shangzhen Yang",
+    public Employee kristong() {
+        return new Employee (
+            "Kris",
             "Student",
-            "Hello, World!",
-            "your-name.jpg",
-            "Wallpaper of Movie Your Name"
+            "Hello",
+            "boy.jp",
+            "🙏"
         );
     }
 }