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

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 davyhyunProduct() {
+	return new Product( 	
+	    "Protein Powder",
+	    "Protein Powder to make you huge",
+            "ProteinPowder.jpg",
+            "Image of our Protein Powder product",
+            23.97	    
+	);
+    }	    
+
     public Product yverma23sProduct() {
 	return new Product(
 	    "Lebron 2's",
@@ -565,6 +585,15 @@ public class Products { /* a good class, but not as good as cse391 */
                 "720s.jpeg",
                 "Picture of the supercar",
                 209900.00
+    	    );
+    }
+        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 davyhyun() {	
+   	return new Employee(
+	    "David Hyun",
+	    "The GOAT",
+	    "Currenty Cookin",
+	    "GordonRamsey.jpg",
+	    "Gordon Ramsey Cooking"
+	);
+   }
+
+   	
    public Employee yverma23() {
         return new Employee(
             "Yash Verma",
@@ -549,6 +571,26 @@ public class Staff {
         );
     }
 
+    public Employee jabrah05() {
+	return new Employee(
+	    "John",
+	    "Student",
+	    "Pro procrastinator",
+	    "snow_lake.jpg",
+	    "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",
@@ -589,3 +631,4 @@ public class Staff {
         );
     }
 }	
+



-fixing things Merge branch 'main' of gitlab.cs.washington.edu:cse391/24wi/faang into tyzhou05_staff_page
-
-# Please enter a commit message to explain why this merge is necessary,
-# especially if it merges an updated upstream into a topic branch.
-#
-# Lines starting with '#' will be ignored, and an empty message aborts
-# the commit.