Merge branch 'main' into 'kristong_staff_page'

# Conflicts:
#   Products.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,6 +41,7 @@ public class Products { /* a good class, but not as good as cse391 */
 		    "Lazy egg",
 		    1000.0
 		    );
+
     }
 
     public Product kevinh33Product() {
@@ -814,6 +825,16 @@ public class Products { /* a good class, but not as good as cse391 */
             "acura.jpg",
             "Acura Integra",
 			52400
+		);
+	}
+	
+    public Product shangy24Product() {
+        return new Product(
+            "Windows 10 Pro",
+            "An operating system made by Microsoft",
+            "win10.jpg",
+            "Windows 10 Default Wallpaper",
+            199.99
         );
     }
 }

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,7 @@ public class Staff {
    }
 	
 
+
    public Employee cuperido() {
        return new Employee(
            "Young You",