Completed clean up and additions

Inventory.java

@@ -9,10 +9,13 @@ public class Inventory {
     }
 
     public void updateQuality() {
-
+        if (items[i].getName().equals("Conjured")){
+            items[i].setQuality(items[i].getQuality() *2);
+        }
         if (!items[i].getName().equals("Aged Brie") && !items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
-            if (items[i].getQuality() > 0 && items[i].getQuality() < 50) {    //cp1
+            if (items[i].getQuality() > 0 && items[i].getQuality() < 50) {  
                 items[i].setQuality(items[i].getQuality() - 1);
+                items[i].setSellIn(items[i].getSellIn() - 1);  
             }
         } 
         else {
@@ -21,17 +24,10 @@ public class Inventory {
             }
         }
 
-        if (!items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
-            items[i].setSellIn(items[i].getSellIn() - 1);
-        }
-
-        if (items[i].getSellIn() < 0) {
-            if (!items[i].getName().equals("Aged Brie")) { 
-                items[i].setQuality(items[i].getQuality() - 1);
-            } 
+        if (items[i].getSellIn() < 0 && !items[i].getName().equals("Aged Brie")) {
+                items[i].setQuality(items[i].getQuality() - 1); 
         }
-        //new brie
-        if (items[i].getName().equals("Aged Brie") && items[i].getQuality() < 50){
+        if (items[i].getName().equals("Aged Brie") && items[i].getQuality() < 50 && items[i].getSellIn() < 0 ){
             items[i].setQuality(items[i].getQuality() + 1);
 
         }