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

Conflicts:
	src/com/bayviewglen/zork/Game.java

data/enemies.dat

@@ -1,4 +1,10 @@
 Enemy Name: Henry Pellatt
 Description: The owner of the Castle 
-Starting Room: Circle Room
-Damage Given: 25
+Starting Room: Apple Hallway
+Damage Given: 25
+Loot: Crowbar
+Enemy Name: Lady Pellatt
+Description: The wife to the owner of the Castle 
+Starting Room: Lady Pellatt's Bedroom
+Damage Given: 25
+Loot: Crowbar

data/rooms.dat

@@ -146,7 +146,7 @@ Room name: Evergreen Bedroom
 Room Description: Oh look! Another bedroom! How exciting! This one's walls are even green this time.<br>Cool!
 Locked: false
 Boarded: false
-Items:
+Items:Sword
 Riddler:
 Exit Rooms: N-Silver Stairs (2nd Floor), W-Aspen Bedroom
 

data/synonyms.dat

@@ -46,10 +46,12 @@ absorb, eat
 drink, eat
 i, inventory
 henry, henrypellatt
-pellatt, henrypellatt
+lady, ladypellatt
 shaving, shavingcream
 cream, shavingcream
 water, waterbottle
 bottle, waterbottle
 warm, warmbread
-bread, warmbread
+bread, warmbread
+battering, batteringram
+ram, batteringram

data/words.dat

@@ -62,4 +62,7 @@ henrypellatt, enemy
 riddler, friend
 clock, item
 keyboard, item
-lightbulb, item
+lightbulb, item
+craft, verb
+batteringram, item
+ladypellatt, enemy