Sriram's changes

Products.java

@@ -110,7 +110,6 @@ public class Products { /* a good class, but not as good as cse391 */
 	);
     }
 
-<<<<<<< HEAD
     public Product yixuan19Product(){
     	return new Product (
 		"Goomba",
@@ -118,7 +117,7 @@ public class Products { /* a good class, but not as good as cse391 */
 		"Avatar.png",
 		"Picture of Gawr Gura",
 		114514.0
-=======
+
     public Product skuttyProduct() {
 	return new Product(
 	    "Rake",
@@ -126,7 +125,6 @@ public class Products { /* a good class, but not as good as cse391 */
 	    "rake.jpg",
 	    "image of a rake",
 	    5959.59
->>>>>>> skutty_staff_page
 	);
     }
 }