From 300d8ab69e89708a16513c4efe531c575824b87d Mon Sep 17 00:00:00 2001
From: lul11003 <lutong.liu@uconn.edu>
Date: Sat, 25 Apr 2015 12:03:04 -0400
Subject: [PATCH] Object collison

---
 MerchantRPGCSE2102/src/controller/RPGame.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MerchantRPGCSE2102/src/controller/RPGame.java b/MerchantRPGCSE2102/src/controller/RPGame.java
index 3740343..e05082e 100644
--- a/MerchantRPGCSE2102/src/controller/RPGame.java
+++ b/MerchantRPGCSE2102/src/controller/RPGame.java
@@ -79,7 +79,7 @@ public RPGame(int transactionLimit, int tileSize) {
 		mapui.addCollison(rows-2, cols/2);
 		mapui.addMerchantSprite(rows/2, cols-2);
 		mapui.addCollison(rows/2, cols-2);
-		
+		//just the object collison
 		mapui.addCollison(rows/3, cols/3);
 		
 		// Creating JFrame window