Merge remote-tracking branch 'origin/main' into wgong2_staff_page

resolving merge conflict

Products.java

@@ -838,6 +838,15 @@ public class Products { /* a good class, but not as good as cse391 */
 		1000.0
 	);
     }
+    public Product aagateProduct() {
+    	return new Product(
+		"Meta quest",
+		"a virtual reality headset",
+		"metaquest.jpg",
+		"A meta quest 3 on Amazon",
+		9.00
+	);
+    }
 
 	public Product acuraIntegra() {
         return new Product (

Staff.java

@@ -859,6 +859,15 @@ public class Staff {
                 "celsius picture"
         );    
     }
+    public Employee aagate() {
+    	return new Employee(
+	    "Arohan",
+	    "Student",
+	    "doing homework",
+	    "sloth.jpg",
+	    "picture of a sloth"
+	);
+    }
 
     public Employee kristong() {
         return new Employee (