Merge branch 'main' into 'jabrah05_staff_page'

# Conflicts:
#   Products.java
#   Staff.java

Product.java

@@ -36,5 +36,4 @@ public class Product {
     public String toString() {
         return "Product";
     }
-
 }

Products.java

 /* check out these products! */
 public class Products { /* a good class, but not as good as cse391 */
     
+    public Product ctsai7Product() {
+	return new Product(
+		"G. Loomis GLX Casting Rod",
+		"Fishing rod",
+		"g_loomis_glx.jpg",
+		"A g.loomis casting rod",
+		460.00
+		);	
+    }
     public Product yverma23sProduct() {
 	return new Product(
 	    "Lebron 2's",
@@ -162,7 +171,7 @@ public class Products { /* a good class, but not as good as cse391 */
             10000
         );
     }
-
+	
     public Product raosProduct() {
 	return new Product(
 	    "Keychain",
@@ -401,6 +410,17 @@ public class Products { /* a good class, but not as good as cse391 */
 	);
     }
 
+    public Product zliu44Product(){
+        return new Product (
+                "Coffee mug",
+                "Made by pure clay and human made not by machine",
+                "mug.jpg",
+                "a good looking mug is on the table",
+                25.99
+        );
+    }
+
+
     public Product ryrozProduct() {
 	return new Product(
 		"A broken computer",
@@ -497,14 +517,62 @@ 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 jabrah04Product() {
-	return new Product(
-		"Starbucks Chilled Frappuccino",
-		"Best way to wake you up and keep you going",
-		"coffee.jpg",
-		"Different flavors of frappuccino",
-		5.99
+    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
+        );
+    }
+
+    public Product cscs24Product() {
+            return new Product(
+                "Coffee",
+                "Good coffee",
+                "coffee.jpeg",
+                "Picture of coffee",
+                4.99
+        );
+    }
+        public Product tly6() {
+        return new Product(
+        "Intel Core i9 14900K",
+        "Great Performance in Creative Apps",
+        "Intel-CoreI9.jpeg",
+        "Picture of Intel Processor",
+        589.00
+        );
+    }
 }

Staff.java

 public class Staff {
+	
+   public Employee ctsai7() {
+	   return new Employee(
+	   	"Calvin Tsai",
+		"Student",
+		"excited",
+		"smallmouth_bass.jpg",
+		"a fish I like to catch"
+	  	);
+   }
+
    public Employee yverma23() {
         return new Employee(
             "Yash Verma",
@@ -200,6 +211,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(
@@ -420,6 +441,16 @@ public class Staff {
 		"Sun setting behind ocean"
 	);
     }
+   
+   public Employee zliu44(){
+        return new Employee(
+                "Leo Liu",
+                "Student",
+                "I am a music producer",
+                "yoyo.jpg",
+                "favorite rapper"
+        );
+    }
 
     public Employee ryroz() {
 	return new Employee(
@@ -538,4 +569,45 @@ public class Staff {
 	    "A hike in washington"
 	);
     }
-}
+
+    public Employee tly6() {
+            return new Employee(
+                "Truong",
+                "SOC Architect",
+                "Hardware All the way!!!",
+                "ECE.jpeg",
+                "Picture of a System-On-Chip Hardware"
+         );
+    }
+
+    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"
+        );
+    }
+
+    public Employee cscs24() {
+            return new Employee(
+                "Chaitanya",
+                "Student",
+                "On the grind",
+                "ocean.jpg",
+                "Picture of the ocean"
+        );
+    }
+}	
+