Merge branch 'main' into 'kristong_staff_page'

# Conflicts:
#   Staff.java

Products.java

@@ -44,6 +44,16 @@ public class Products { /* a good class, but not as good as cse391 */
 
     }
 
+       public Product bohanz04Product() {
+            return new Product(
+                            "CSE351 hw problem",
+                            "A confusing problem faced",
+                            "test2.jpg",
+                            "image of that problem",
+                            1.00
+                            );
+    }
+ 
     public Product kevinh33Product() {
 	    return new Product(
 			    "Duolingo owl",

Staff.java

@@ -40,6 +40,15 @@ public class Staff {
    }
 	
 
+   public Employee bohanz04() {
+        return new Employee(
+	    "Bryan Zhao",
+	    "Student",
+	    "abcdefg stuff",
+	    "test1.jpg",
+	    "hope to get internship"
+	);
+   }	   
 
    public Employee cuperido() {
        return new Employee(