fix

src/ui/controller/CategoryController.java

@@ -145,14 +145,10 @@ public class CategoryController {
 	 * @param obj
 	 *            New Object Name
 	 */
-	public void addNewHolonTransformer(Category cat, String objName) {
+	public void addNewHolonTransformer(Category cat, String objName, String image) {
 		HolonTransformer transformer = new HolonTransformer(objName);
-<<<<<<< HEAD
 		transformer.setImage(image);
 		transformer.setSav(cat.getName());
-=======
-		transformer.setImage("/Images/transformer.png");
->>>>>>> abbd669b445b1c4cdebcd61b2925a22ed62217e5
 		addObject(cat, transformer);
 	}
 
@@ -164,14 +160,11 @@ public class CategoryController {
 	 * @param obj
 	 *            New Object Name
 	 */
-	public void addNewHolonSwitch(Category cat, String objName) {
+	public void addNewHolonSwitch(Category cat, String objName, String image) {
 		HolonSwitch holonSwitch = new HolonSwitch(objName);
-<<<<<<< HEAD
+
 		holonSwitch.setImage(image);
 		holonSwitch.setSav(cat.getName());
-=======
-		holonSwitch.setImage("/Images/switch-on.png");
->>>>>>> abbd669b445b1c4cdebcd61b2925a22ed62217e5
 		addObject(cat, holonSwitch);
 	}
 

src/ui/controller/Control.java

@@ -51,11 +51,11 @@ public class Control {
 	// }
 
 	public void addTransformer(Category cat, String objName) {
-		categoryController.addNewHolonTransformer(cat, objName);
+		categoryController.addNewHolonTransformer(cat, objName, "/Images/transformer.png");
 	}
 
 	public void addSwitch(Category cat, String objName) {
-		categoryController.addNewHolonSwitch(cat, objName);
+		categoryController.addNewHolonSwitch(cat, objName, "/Images/switch-on.png");
 	}
 
 	public Category searchCategory(String name) {