diff --git a/Products.java b/Products.java
index c58344f36d1915ae4a9fc89141b7973988aedaf9..845422a28ae630327eb9a404e0700c57b660d6e1 100644
--- a/Products.java
+++ b/Products.java
@@ -517,4 +517,23 @@ public class Products { /* a good class, but not as good as cse391 */
 	);
 
     }
+
+	public Product samsharProduct() {
+	    return new Product(
+		"Spray Ketchup",
+		"Ketchup that you can spray on",
+		"ketchup.jpg",
+		"Example image of spray on ketchup",
+		4.99
+	);
+    }
+	public Product SprayKetchup() {
+        return new Product(
+            "SprayKetchup",
+            "Spray on Ketchup",
+            "ketchup.jpg",
+            "An image of what a spray on ketchup bottle would look like",
+            5.99
+        );
+    }
 }
diff --git a/Staff.java b/Staff.java
index 31a44d41ea0909f4820b61118ed4971d2cd676a1..44f54f6705d9eee6e75b872437ea0a8456d276a3 100644
--- a/Staff.java
+++ b/Staff.java
@@ -539,6 +539,7 @@ public class Staff {
 	);
     }
 
+<<<<<<< Staff.java
 
     public Employee hmantha(){
         return new Employee(
@@ -550,4 +551,15 @@ public class Staff {
         );
     }
 
+
+    public Employee samshar() {
+            return new Employee(
+                "Sami",
+                "Student",
+                "Working hard",
+                "picture.jpg",
+                "Picture of women playing volleyball"
+        );
+    }
+
 }	
diff --git a/images/products/ketchup.jpg b/images/products/ketchup.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f727096dcaaedb13e31d75f909018564a69bc9cf
Binary files /dev/null and b/images/products/ketchup.jpg differ
diff --git a/images/products/picture.jpg b/images/products/picture.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..55786d94bb6545820ab8b61b038eae37ee5a8d9c
Binary files /dev/null and b/images/products/picture.jpg differ
diff --git a/images/staff/ketchup.jpg b/images/staff/ketchup.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f727096dcaaedb13e31d75f909018564a69bc9cf
Binary files /dev/null and b/images/staff/ketchup.jpg differ
diff --git a/images/staff/picture.jpg b/images/staff/picture.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..55786d94bb6545820ab8b61b038eae37ee5a8d9c
Binary files /dev/null and b/images/staff/picture.jpg differ