fix conflicts

data/rooms.dat

@@ -167,11 +167,16 @@ Riddle:
 Exit Rooms: S-Apsen Bedroom, E-Willow Bedroom
 
 Room name: Guest Bedroom
-Room Description: Welcome to the guest bedroom, where guests like yourself stay for the night. Except Sir Pellatt has other plans for you... It looks like there's something on the bed. Might be for you.
+Room Description: Welcome to the guest bedroom, where guests like yourself stay for the night. Except Sir Pellatt has other plans for you... There is faint writing on the west wall. Might want to take a look...
 Locked: false
+<<<<<<< HEAD
 Boarded: false
 Items: Scroll 2 
 Riddle:
+=======
+Items:  
+Riddle: "What letter comes next in this sequence: o,t,t,f,f?", "s"
+>>>>>>> 8e73e9e0244c32a530f67daa085e1b453b1eca7d
 Exit Rooms: E-Linen Closet, S-Another Sitting Area
 
 Room name: Silver Stairs (1st Floor)

src/com/bayviewglen/zork/Command.java

@@ -108,4 +108,6 @@ class Command {
 	public boolean hasEnemy() {
 		return !enemy.equals("");
 	}
+	
+	
 }