Conclude merge and commit changes

Products.java

 /* check out these products! */
 public class Products { /* a good class, but not as good as cse391 */
     
+    public Product kevinh33Product() {
+	    return new Product(
+			    "Duolingo owl",
+			    "He's super angry",
+			    "duo_angry.jpg",
+			    "His anger levels rising",
+			    150.00
+			    );
+    }
+
+    public Product cuperidoProduct() {
+	return new Product( 	
+	    "Pillow",
+	    "Pillow to make you sleep better",
+            "pillow.jpg",
+            "Image of the pillow",
+            19.99	    
+	);
+    }	    
+
     public Product ctsai7Product() {
 	return new Product(
 		"G. Loomis GLX Casting Rod",
@@ -30,6 +50,7 @@ public class Products { /* a good class, but not as good as cse391 */
 	    105.97
 	);
     }	    
+
     public Product joshjyinProduct() {
         return new Product(
             "Dub Hub",
@@ -39,6 +60,7 @@ public class Products { /* a good class, but not as good as cse391 */
             99999999999.99
         );
     }
+
     public Product kevluoyrsProduct() {
         return new Product(
             "Blindr",
@@ -48,6 +70,7 @@ public class Products { /* a good class, but not as good as cse391 */
             99999999999.99
         );
     }
+
     public Product evanlousProduct() {
     	return new Product(
 	    "Dorito Piece",
@@ -620,6 +643,7 @@ public class Products { /* a good class, but not as good as cse391 */
         );
     }
 
+
     public Product ggsmadhuProduct() {
         return new Product(
             "Coca Cola",
@@ -628,5 +652,27 @@ public class Products { /* a good class, but not as good as cse391 */
             "Coca Cola can",
             1.50
         );
+
+    public Product chetan7() {
+            return new Product(
+                "Porche 911",
+                "Best car ever made",
+                "911.jpg",
+                "A porche 911",
+                114000.00
+            );
+    
+    }
+
+    public Product sgodse() {
+
+	    return new Product(
+		"Lindt Chocolate", 
+		"Rich, tasty chocolate",
+		"lindt.jpg",
+		"Picture of a lindt milk chocolate package",
+		2.00
+	);
+
     }
 }

Staff.java

 public class Staff {
 	
+   public Employee cuperido() {
+       return new Employee(
+           "Young You",
+           "Dreamer",
+           "Sleep required",
+           "dreamer.jpg",
+           "zzz.. zzz.."
+       );
+   }
+
    public Employee ctsai7() {
 	   return new Employee(
 	   	"Calvin Tsai",
@@ -49,6 +59,16 @@ public class Staff {
        );
     }
 
+    public Employee kevinh33() {
+	return new Employee(
+	    "Kevin Hernandez",
+	    "Student",
+	    "Loves pets",
+	    "silly_dino.png",
+	    "My silly cat"
+	);
+    } 
+
     public Employee evanlou() {
     	return new Employee(
 	    "Evan Lou",
@@ -652,6 +672,7 @@ public class Staff {
                 "Picture of the McLaren F1 car"
         );
     }
+
      public Employee ggsmadhu(){
     	    return new Employee(
 		"Madhumitha",
@@ -660,6 +681,25 @@ public class Staff {
 	       	"mountsi.jpeg",
 	       	"Mount Si"
 	);
+
+    public Employee chetan7() {
+            return new Employee(
+                "Chetan",
+                "Student",
+                "Switching to Info",
+                "gojo.jpg",
+                "nah id win"
+        );
+    }
+
+    public Employee sgodse() {
+	    return new Employee(
+	        "Shivani",
+		"Student",
+		"CS Student", 
+		"coffee.jpg",
+		"picture of a coffee"
+		); 
     }
 }