Merge branch 'main' into 'tshukl_staff_page'

# Conflicts:
#   Products.java

Products.java

@@ -120,6 +120,26 @@ public class Products { /* a good class, but not as good as cse391 */
 	);
     }
 
+    public Product keshavsProduct() {
+	return new Product(
+		"Dirt",
+		"Great for plants!",
+		"dirt.jpg",
+		"image of the product",
+		4.67
+		);
+	}
+
+    public Product dhvbnlProduct() {
+        return new Product (
+                "proteen",
+                "gets you jacked",
+                "proteen.jpg",
+                "image of proteen powder",
+                9.99
+        );
+    }
+
     public Product yixuan19Product(){
     	return new Product (
 		"Goomba",
@@ -129,6 +149,7 @@ public class Products { /* a good class, but not as good as cse391 */
 		114514.0
    	);
     }
+
     public Product swangsamProduct(){
    	return new Product(
 		"Pullup Bar",

Staff.java

@@ -138,6 +138,28 @@ public class Staff {
 	);
     }
 
+    public Employee kesach() {
+	return new Employee(
+		"Keshav",
+		"Procrastinator",
+		"I'm hungry",
+		"keshav.jpg",
+		"a swig of chai"
+    	);
+    }
+
+
+    public Employee dhvbnl() {
+    	return new Employee (
+		"Dhruv",
+		"tech student",
+		"breaking things that work, making things that break",
+		"dhvbnl.jpg",
+		"pillow representing dhruv"
+	);
+    }
+
+
     public Employee yixuan19() {
     	return new Employee (
 		"Yixuan",