From 77ae3828bde4293e9564084482e9accae470d846 Mon Sep 17 00:00:00 2001
From: Gavin Li <itsgavin.li@gmail.com>
Date: Mon, 2 Feb 2015 02:07:45 -0500
Subject: [PATCH] reorganized some classes

---
 MerchantRPGCSE2102/src/{ => game}/Item.java          | 1 +
 MerchantRPGCSE2102/src/{ => game}/Merchant.java      | 1 +
 MerchantRPGCSE2102/src/{ => tests}/testMerchant.java | 3 +++
 3 files changed, 5 insertions(+)
 rename MerchantRPGCSE2102/src/{ => game}/Item.java (55%)
 rename MerchantRPGCSE2102/src/{ => game}/Merchant.java (94%)
 rename MerchantRPGCSE2102/src/{ => tests}/testMerchant.java (89%)

diff --git a/MerchantRPGCSE2102/src/Item.java b/MerchantRPGCSE2102/src/game/Item.java
similarity index 55%
rename from MerchantRPGCSE2102/src/Item.java
rename to MerchantRPGCSE2102/src/game/Item.java
index 4590472..500a9bc 100644
--- a/MerchantRPGCSE2102/src/Item.java
+++ b/MerchantRPGCSE2102/src/game/Item.java
@@ -1,3 +1,4 @@
+package game;
 
 public class Item 
 {
diff --git a/MerchantRPGCSE2102/src/Merchant.java b/MerchantRPGCSE2102/src/game/Merchant.java
similarity index 94%
rename from MerchantRPGCSE2102/src/Merchant.java
rename to MerchantRPGCSE2102/src/game/Merchant.java
index 4ea2285..c77f5f1 100644
--- a/MerchantRPGCSE2102/src/Merchant.java
+++ b/MerchantRPGCSE2102/src/game/Merchant.java
@@ -1,3 +1,4 @@
+package game;
 
 public class Merchant
 {
diff --git a/MerchantRPGCSE2102/src/testMerchant.java b/MerchantRPGCSE2102/src/tests/testMerchant.java
similarity index 89%
rename from MerchantRPGCSE2102/src/testMerchant.java
rename to MerchantRPGCSE2102/src/tests/testMerchant.java
index 18a9aac..54c5d07 100644
--- a/MerchantRPGCSE2102/src/testMerchant.java
+++ b/MerchantRPGCSE2102/src/tests/testMerchant.java
@@ -1,3 +1,6 @@
+package tests;
+
+import game.Merchant;
 import junit.framework.TestCase;