Committing updated version of my branch which now includes files from…

… the master.

MerchantRPGCSE2102/src/controller/RPGame.java

@@ -275,8 +275,7 @@ public static void main(String[] args) throws InterruptedException
 		ArrayList<String> playerInventory = _rpg.getMerchantInventoryList(1);
 		playerInventory.addAll(_rpg.getMerchantInventoryList(2));
 		playerInventory.addAll(_rpg.getMerchantInventoryList(3));
-		_rpg.buildPlayer("test", 500, playerInventory);
-<<<<<<< HEAD
+		_rpg.buildPlayer("test", 500, playerInventory);
 		_rpg.getPlayer().getItem("armor").increaseQuantity(15);
 
 
@@ -311,17 +310,16 @@ public static void main(String[] args) throws InterruptedException
 			frame.setResizable(false);
 			frame.setVisible(true);
 			frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-			frame.setLocationRelativeTo(null); 	
+			frame.setLocationRelativeTo(null); 
+			_rpg.getPlayer().getItem("WoodPlanks").increaseQuantity(15);
+
 
 			// MAIN GAME LOOP
 			while (true) {
 				mapui.move();
 				mapui.repaint();
 				Thread.sleep(100/12); // Controls the speed of the game (currently 120 frames/second)
-			}
-=======
-		_rpg.getPlayer().getItem("WoodPlanks").increaseQuantity(15);
-		_rpg.createTransaction(_rpg.getPlayer(), _rpg.getMerchant(3));
->>>>>>> ab3b505559eadb3b59b74c449dcbbe17d32e2197
+			}
+
 	}
 }