Merge branch 'main' into 'kevyin30_staff_page'

# Conflicts:
#   Products.java
#   Staff.java

Products.java

@@ -413,13 +413,23 @@ public class Products { /* a good class, but not as good as cse391 */
 	);
     }
 
-    public Product kevyin30Product() {
+    public Product cvanleerProduct() {
+	return new Product(
+		"Milky Way",
+		"Contains chocolate, caramel, nougat and you",
+		"galaxy.jpg",
+		"A yellowish galaxy in space",
+		27000.00
+	);
+    }
+
+	public Product kevyin30Product() {
     	return new Product(
 		"iPhone 30 Pro Max",
 		"another new phone with nothing new",
 		"iphone15promax.jpg",
 		"iPhone 15 Pro Max",
 		1999
-	);
-    }
+		);
+	}
 }

Staff.java

@@ -443,6 +443,16 @@ public class Staff {
 		"Person skiing"
 	 );
     }
+    
+    public Employee cvanleer() {
+	    return new Employee(
+		"Cole",
+		"Security Officer",
+		"Likes to eat everything",
+		"kirby_sword.png",
+		"Kirby with a sword"
+	 );
+    }
 
     public Employee kevyin30() {
     	return new Employee(
@@ -451,6 +461,6 @@ public class Staff {
 		"I am a person",
 		"kevyin30.jpg",
 		"neutral emoji"
-	);
+	    );
     }
 }