Merge branch 'master' of https://github.com/jslightham/Zork

src/com/bayviewglen/zork/Items/WarmBread.java

@@ -1,8 +0,0 @@
-package com.bayviewglen.zork.Items;
-public class WarmBread extends Item{
-	
-	public WarmBread(){
-		super(25, "Warm Bread", "A fresh loaf of bread sits just outside of the oven still warm to the touch", true, 30, 10);
-	}
-
-}

src/com/bayviewglen/zork/Items/Warmbread.java

@@ -0,0 +1,9 @@
+package com.bayviewglen.zork.Items;
+
+public class Warmbread extends Item{
+	
+	public Warmbread() {
+		super(25, "Warm Bread", "A freshly baked loaf of bread sits ominously on the counter", true, 20, 10);
+	}
+
+}

src/com/bayviewglen/zork/Items/Waterbottle.java

@@ -1,7 +1,7 @@
 package com.bayviewglen.zork.Items;
-public class WaterBottle extends Item{
+public class Waterbottle extends Item{
 	
-	public WaterBottle() {
+	public Waterbottle() {
 		super(10, "Water Bottle", "A plastic water bottle half filled with filthy water", true, 10, 1);
 	}