Resolve conflicts in Products.java and Staff.java

Products.java

@@ -10,6 +10,16 @@ public class Products { /* a good class, but not as good as cse391 */
 			    150.00
 			    );
     }
+	
+    public Product acsparksProduct() {
+    	return new Product(
+		"Free Beans",
+		"A bunch of free, loose beans",
+		"beans.jpg",
+		"Image of free beans",
+		1.99
+		);
+    }
 
     public Product cuperidoProduct() {
 	return new Product( 	
@@ -652,7 +662,7 @@ 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",
@@ -674,5 +684,15 @@ public class Products { /* a good class, but not as good as cse391 */
 		2.00
 	);
 
+	        }
+
+    public Product sprofit() {
+	return new Product(
+	    "Baseball Glove",
+	    "Premium leather baseball glove",
+	    "BaseballGlove.jpeg",
+	    "Picture of a Rawlings baseball glove",
+	    399.99
+	);
     }
 }

Staff.java

@@ -10,6 +10,16 @@ public class Staff {
        );
    }
 
+   public Employee acsparks() {
+	   return new Employee(
+		"Aiden Sparks",
+		"Student",
+		"Stuck in the Allen basement",
+		"beans.jpg",
+		"bean texture"
+		);
+   }
+
    public Employee ctsai7() {
 	   return new Employee(
 	   	"Calvin Tsai",
@@ -681,7 +691,7 @@ public class Staff {
 	       	"mountsi.jpeg",
 	       	"Mount Si"
 	);
-
+     }
     public Employee chetan7() {
             return new Employee(
                 "Chetan",
@@ -701,5 +711,15 @@ public class Staff {
 		"picture of a coffee"
 		); 
     }
+
+    public Employee sprofit() {
+	return new Employee(
+	    "Sam",
+	    "Student",
+	    "EE Student",
+	    "TimLIncecum.jpeg",
+	    "Picture of my favorite pitcher"
+        );
+    }
 }