From 7559485eda5826d4cc2be9bc0e0e582a650253b0 Mon Sep 17 00:00:00 2001
From: Joe Hill <hillj1895@yahoo.com>
Date: Tue, 14 Mar 2017 20:23:51 -0400
Subject: [PATCH] Sup

---
 .DS_Store                     | Bin 0 -> 6148 bytes
 bin/.gitignore                |   3 ++-
 bin/controller/Cashflow.class | Bin 1340 -> 1334 bytes
 src/.DS_Store                 | Bin 0 -> 6148 bytes
 src/controller/Cashflow.java  |   2 +-
 src/model/CardStack.java      |   2 +-
 src/model/GameBoard.java      |   2 +-
 7 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 src/.DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5f43d6065d812e0ccae8df659b467478c82dcae3
GIT binary patch
literal 6148
zcmeHK&x_MQ6n@i2O%=6*uzSo!@KBZw!rEn7h&6lIgRmIUgUW8wls1rLN|Rc&R`PG?
z&70!?A?QIo2p&Cn7XJZ3-<z4O$+mmhgUB)u-h7jJ@0%ar(3uVZu+BKN0h$0{q7xeD
zu~=dhCtt9dYPo{QsE@dBdtIIk7czB&RzNH8KPo`KT?5vj4-w>*-*0W}Mmd&n*A2&c
z7vRgc*Pp~v=DdW5$Hs<((wT5+kBD^$aI|zc=G`FX0k+WbvxR>Bw=k^Dvnq3fkCdtS
zr5Szy`L4_<&F4s@G8^`pNDa6PJ8%nJxP!O`34}*x_7=0MGs|EE-D(zFS)LV4vY}e#
zhhP{-S-!shmDTFTnX~82M#F4eG#`5dKJjutA7>qZ^iX_7VJ}eidz{Dfx*yz+dXxR;
z)!RJH{V45?O6iXtL}|z;9X?LOO!Two=L6)5f%coL)2Y2_w=8?3J!@Ih_RY<fwPCks
zGt*qTW^eBvBu}4BpU+;rBwg@K$3tD%Wrc_E3M+LGB2>5M{hPm$^7j1rC8&y1-kxe?
z$@VDD6K|BpJndsYhqDr0>f+=IC?U-YC+|WtwE|j!Q>p-+4;DJ1qp*-Djt(ru69Cb`
zW?@*TE1Ec#LPudC5hG|!QV}JUsV4@LbZoa&o};jkDCxk|<AbS@nR=lxF*^2diF9C&
zL|tkHv;tKH>hiNm_y5lE@Bb=Ee`y7@0;fs=X1Jc)!6m7?bzyOI*IMWY=wy^vNE8$-
j)O9Q>bQQ0n3&WU26+}m2ArV{9^dA8sgD$iJ|5SlLxf8z<

literal 0
HcmV?d00001

diff --git a/bin/.gitignore b/bin/.gitignore
index 66b02ab..66905d0 100644
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -1,3 +1,4 @@
+/.DS_Store
+/controller/
 /model/
 /view/
-/controller/
diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class
index bf36558152ab881448e4d626a6a50d6de2641929..37ff42fd6a419eff73e89640ccb1fd665407f971 100644
GIT binary patch
delta 22
ecmdnPwT)}TEGABl^wg4&%#xhc%`2HEGXVfy<_H-8

delta 28
kcmdnSwTElNEGB-w^wbiU)Z*l#%z~24{JhPJnI<y<0GL$@p#T5?

diff --git a/src/.DS_Store b/src/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..6c20a5838c290b18ac6a2741a63c0c9b316c3e76
GIT binary patch
literal 6148
zcmeHK&x;c=6n@!u-RX*0LD)UcMexu==dyMYVW{=6co8akP}%Kt%64EnDeZKN)@uI^
z_u|2m;8E~j(7WJG{}lc55=+KzVNW7%UP->p`;p{*nIs(|63s~*5LJoDLs3}XMs<cL
zyDBTPVKmo(g8LYeq!hm%jaIy!!ZF|&_}3Uvdv}|<*tZ$w*tN_3dyvX*l*$NpbvWEc
zx%ra?tu-;}anSC{!H_+u^kJRfK(<=(B<~V^{c-w{z0aJ(K*s0t8}{vS)pTi-2FNAG
zNtFJP$$MDsOf1i6Iv$#wzeK|{8Rzx-H?dJFZ(iE+DiyDC#e3H7%V|6B<dbo;GkU^L
zN!*J}`=ONSvfYUuCB5lk_4-|z<((w!jV$-4kCQBx)25tc@tFI0(8>FV<$(^XyR%ua
zAJqI{uQ9Lrv&OCcn!gt`=5x>6xe?qsI2t^EF?%_G^@iyqfdiQ3s=?oIiiVY9af#m5
zi&lGK-oEB8tXO+FR;`6a5d02Uu_x_OmdflHeX5z3>4Xw2&a}8VVh1*Rah86?d2fBT
z`><yH{r)Fdtp2Szuh<GRCPl@?67$M<moHY@E?dWdW8fSNsPn-`Q5YIrXyl^<6@LN%
z%TTkR&G#?RR|;TgaG?<zh|r-x9V*NxhS1^A`^GOcxX`G>N$|+%$BZn@7mDD~q4(LH
zM5xi#jseF&k%5watg8F}-umzVVvu`s3^)e<D+WZl)owMBlDS(~l2doBk8*^fMENZ=
matJDO9dkon#k(jhu=%P13=J+cLIZJs1egX_IR^eJ1HS;0@y_4?

literal 0
HcmV?d00001

diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java
index 08160b7..1d75f68 100644
--- a/src/controller/Cashflow.java
+++ b/src/controller/Cashflow.java
@@ -21,7 +21,7 @@ public class Cashflow
 		for(int i=0; i<initialSize; i++)
 		{
 			int num = i+1;
-			System.out.println(num + ": " + ((MarketCard) ms.pop()).getDescription()); //Always going to need this cast when getting description unfortunately
+			System.out.println(num + ": " + ((MarketCard) ms.pop()).getTitle()); //Always going to need this cast when getting description unfortunately
 		}
 	}
 	
diff --git a/src/model/CardStack.java b/src/model/CardStack.java
index 4f2f693..1148571 100644
--- a/src/model/CardStack.java
+++ b/src/model/CardStack.java
@@ -47,7 +47,7 @@ public class CardStack extends Stack<Card>
 	// Randomizes the stack with the cards in the array argument
 	public void randomizeCards(Card[] cardArray)
 	{
-		//CardStack cardStack = new CardStack();
+		// CardStack cardStack = new CardStack();
 		ArrayList<Card> cardList = new ArrayList<Card>();
 		Random r = new Random();
 		
diff --git a/src/model/GameBoard.java b/src/model/GameBoard.java
index 85eade4..fb0b7c3 100644
--- a/src/model/GameBoard.java
+++ b/src/model/GameBoard.java
@@ -4,5 +4,5 @@ public class GameBoard
 {
 	private Tile[] _gameTiles;
 	
-	// This class should have an array of tiles that goes back to the beginning when it eaches the end
+	// This class should have an array of tiles that goes back to the beginning when it reaches the end
 }