Merge branch 'main' into 'tly6_staff_page'

# Conflicts:
#   Staff.java

Products.java

@@ -162,7 +162,7 @@ public class Products { /* a good class, but not as good as cse391 */
             10000
         );
     }
-
+	
     public Product raosProduct() {
 	return new Product(
 	    "Keychain",
@@ -450,6 +450,15 @@ public class Products { /* a good class, but not as good as cse391 */
 	);
     }
 
+    public Product spzappaProduct() {
+	return new Product(
+		"Elkay LZS8WSLK EZH2O Bottle Filling Station",
+		"greatest water fountain of all time",
+		"waterfountain.png",
+		"Water fountain w/ water bottle filler",
+		1312.99
+	);
+    }		
     public Product cvanleerProduct() {
 	return new Product(
 		"Milky Way",
@@ -488,4 +497,43 @@ public class Products { /* a good class, but not as good as cse391 */
 		3.99
 	);
     }
+	
+	public Product mbalakProduct() {
+        return new Product(
+            "Big Mac",
+            "McDonald's Big Mac",
+            "BigMac.jpeg",
+            "image of Big Mac",
+            5
+		);
+	}
+
+    public Product ccsekhar20Product() {
+	    return new Product(
+		"Coffee",
+		"Good coffee",
+		"coffee.jpeg",
+		"Picture of coffee",
+		4.99
+	);
+    }
+
+	public Product samsharProduct() {
+	    return new Product(
+		"Spray Ketchup",
+		"Ketchup that you can spray on",
+		"ketchup.jpg",
+		"Example image of spray on ketchup",
+		4.99
+	);
+    }
+	public Product SprayKetchup() {
+        return new Product(
+            "SprayKetchup",
+            "Spray on Ketchup",
+            "ketchup.jpg",
+            "An image of what a spray on ketchup bottle would look like",
+            5.99
+        );
+    }
 }

Staff.java

@@ -200,6 +200,16 @@ public class Staff {
             "panda icon"
         );
     }
+   
+    public Employee mbalak() {
+    	return new Employee(
+	      "Manav",
+	      "Student",
+	      "Studies",
+	      "LongLiveASAP.jpeg",
+	      "Long.Live.A$AP by A$AP Rocky"
+	    );
+    }
 
     public Employee kgrao() {
 	return new Employee(
@@ -479,6 +489,16 @@ public class Staff {
 		"Person skiing"
 	 );
     }
+
+    public Employee spzappa() {
+	 return new Employee(
+		"Sam",
+		"Student",
+		"just failed a midterm",
+		"stickman.png",
+		"stick man"
+	 );
+    }
     
     public Employee cvanleer() {
 	    return new Employee(
@@ -519,6 +539,7 @@ public class Staff {
         );
     }
 
+<<<<<<< Staff.java
 
     public Employee tly6() {
             return new Employee(
@@ -530,4 +551,24 @@ public class Staff {
          );
     }
 
+=======
+    public Employee ccsekhar20() {
+	    return new Employee(
+		"Chaitanya",
+		"Student",
+		"On the grind",
+		"ocean.jpg",
+		"Picture of the ocean"
+	);
+    }
+
+    public Employee samshar() {
+            return new Employee(
+                "Sami",
+                "Student",
+                "Working hard",
+                "picture.jpg",
+                "Picture of women playing volleyball"
+        );
+    }
 }