Fixed merge conflicts, updating with main.

Products.java

@@ -79,6 +79,16 @@ public class Products { /* a good class, but not as good as cse391 */
 	);
     }
 
+    public Product isaacsProduct() {
+	return new Product(
+	    "Bucolic Green Hills",
+	    "Take a deep breath and relax",
+	    "windows_xp_bliss.jpeg",
+	    "rolling grass fields, blue skies, white clouds",
+	    100000
+        );
+    }
+
     public Product aamangusProduct() {
     	return new Product(
 		"Broody Chicken",

Staff.java

@@ -98,6 +98,16 @@ public class Staff {
 	);
     }
 
+    public Employee isaacwu() {
+        return new Employee(
+	    "Isaac",
+	    "Programmer",
+	    "Can I go to sleep now?",
+	    "icon.jpeg",
+	    "angrily studying"
+       );
+    }
+
     public Employee aamangus() {
     	return new Employee(
 		"Anthony",