Merge main into aagate_staff_page

Products.java

@@ -827,7 +827,6 @@ public class Products { /* a good class, but not as good as cse391 */
 		1000.0
 	);
     }
-<<<<<<< HEAD
     public Product aagateProduct() {
     	return new Product(
 		"Meta quest",
@@ -836,7 +835,7 @@ public class Products { /* a good class, but not as good as cse391 */
 		"A meta quest 3 on Amazon",
 		9.00
 	);
-=======
+    }
 
 	public Product acuraIntegra() {
         return new Product (
@@ -856,6 +855,5 @@ public class Products { /* a good class, but not as good as cse391 */
             "Windows 10 Default Wallpaper",
             199.99
         );
->>>>>>> origin/main
     }
 }

Staff.java

@@ -847,7 +847,6 @@ public class Staff {
                 "celsius picture"
         );    
     }
-<<<<<<< HEAD
     public Employee aagate() {
     	return new Employee(
 	    "Arohan",
@@ -856,7 +855,7 @@ public class Staff {
 	    "sloth.jpg",
 	    "picture of a sloth"
 	);
-=======
+    }
 
     public Employee kristong() {
         return new Employee (
@@ -876,7 +875,6 @@ public class Staff {
             "your-name.jpg",
             "Wallpaper of Movie Your Name"
         );
->>>>>>> origin/main
     }
 }