Merge

Products.java

 /* check out these products! */
 public class Products { /* a good class, but not as good as cse391 */
+
+    public Product boschenProduct() {
+	return new Product(
+		"sleepCoke",
+		"It will help you a nice sleep",
+		"sleepCoke.jpg",
+		"really good, has sleepy coffine",
+		9.98	
+		);
+    }
+
     
+
+    public Product benoreProduct() {
+	    return new Product(
+			    "Taylor Swift - Folklore Vinyl",
+			    "A vinyl containing the deluxe edition of Taylor Swift's Grammy-winning FFolklore album.",
+			    "folkloreac.png",
+			    "The album cover for Taylor Swift's folklore album.",
+			    29.99
+			    );
+    }
+
+    public Product ekimji1Product() {
+	return new Product(
+		    "Gudetama",
+	    	"perfect",
+		    "gudetama.jpg",
+		    "Lazy egg",
+		    1000.0
+		    );
+    }
+
     public Product kevinh33Product() {
 	    return new Product(
 			    "Duolingo owl",
@@ -765,4 +797,13 @@ public class Products { /* a good class, but not as good as cse391 */
         );
 
     }
+    public Product pranavntProduct() {
+	return new Product(
+		"Celsius Essentials 1000 pack",
+		"1000 pack of celsius essentials. will keep you awake.",
+		"celsius-picture.png",
+		"Celsius Essentials",
+		1000.0
+	);
+    }
 }

Staff.java

 public class Staff {
+
+
+   public Employee boschen() {
+   	return new Employee(
+		"Boshan Chen",
+		"Sleeper",
+		"Sleep and stare blankly",
+		"White.jpg",
+		"umm.."
+	);
+   }
+   public Employee ekimji() {
+	   return new Employee(
+		"Esther",
+		"student",
+		"local point demon",
+		"gudetama.jpg",
+		"gudetama with balloon"
+	);
+   }
 	
+   public Employee benore() {
+	   return new Employee("Ben",
+			   "Student",
+			   "Computer Science student",
+			   "benore.jpg",
+			   "Picture of Ben Oreizy");
+   }
+	
+
    public Employee cuperido() {
        return new Employee(
            "Young You",
@@ -788,6 +817,7 @@ public class Staff {
            "Norman Rockwell Self-Portrait"
        );
    }
+<<<<<<< HEAD
 
    public Employee rlyons() {
 	   return new Employee(
@@ -801,4 +831,16 @@ public class Staff {
 			 
 }
 
+=======
+    public Employee pranavnt() {
+        return new Employee(
+                "Pranav",
+                "Student",
+                "i like celsius",
+                "celsius-picture.png",
+                "celsius picture"
+        );    
+    }
+}	
+>>>>>>> 311cbc24436a3ea467c0c94dab3b0a6982401e95