From b90e6c8f09c5e7a53b7e5c5f0a9ea4d4b282b319 Mon Sep 17 00:00:00 2001
From: afortuna2016 <afortuna2016@50.28.178.145>
Date: Thu, 6 Apr 2017 15:51:12 -0400
Subject: [PATCH 1/2] small changes

---
 bin/.gitignore                              |   3 +++
 bin/controller/Cashflow.class               | Bin 2328 -> 2328 bytes
 bin/model/BigDealStack.class                | Bin 8559 -> 8559 bytes
 bin/model/Card.class                        | Bin 447 -> 447 bytes
 bin/model/CardStack.class                   | Bin 1828 -> 1828 bytes
 bin/model/CharityTile.class                 | Bin 476 -> 476 bytes
 bin/model/ChildTile.class                   | Bin 470 -> 470 bytes
 bin/model/DealCard.class                    | Bin 1089 -> 1089 bytes
 bin/model/DealTile.class                    | Bin 1842 -> 2245 bytes
 bin/model/Die.class                         | Bin 638 -> 638 bytes
 bin/model/DoodadCard.class                  | Bin 484 -> 484 bytes
 bin/model/DoodadStack.class                 | Bin 4455 -> 4455 bytes
 bin/model/DoodadTile.class                  | Bin 581 -> 581 bytes
 bin/model/FinancialStatement.class          | Bin 4448 -> 4448 bytes
 bin/model/GameBoard.class                   | Bin 2215 -> 2215 bytes
 bin/model/MarketCard.class                  | Bin 1029 -> 1029 bytes
 bin/model/MarketStack.class                 | Bin 11194 -> 11194 bytes
 bin/model/MarketTile.class                  | Bin 351 -> 351 bytes
 bin/model/OwnedRealEstate.class             | Bin 896 -> 896 bytes
 bin/model/PaydayTile.class                  | Bin 351 -> 351 bytes
 bin/model/Player.class                      | Bin 1490 -> 1490 bytes
 bin/model/Profession.class                  | Bin 2597 -> 2597 bytes
 bin/model/Professions.class                 | Bin 1986 -> 1986 bytes
 bin/model/SmallDealStack.class              | Bin 4473 -> 4473 bytes
 bin/model/Stock.class                       | Bin 740 -> 740 bytes
 bin/model/Tile.class                        | Bin 1243 -> 1243 bytes
 bin/model/TileCircularLinkedList$Node.class | Bin 789 -> 789 bytes
 bin/model/TileCircularLinkedList.class      | Bin 2549 -> 2549 bytes
 bin/view/MainWindow$1.class                 | Bin 808 -> 808 bytes
 bin/view/MainWindow.class                   | Bin 1461 -> 1461 bytes
 bin/view/MainWindow1$1.class                | Bin 722 -> 722 bytes
 bin/view/MainWindow1.class                  | Bin 1048 -> 1048 bytes
 bin/view/Window.class                       | Bin 253 -> 253 bytes
 src/model/DealTile.java                     |   5 +++--
 34 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bin/.gitignore b/bin/.gitignore
index 4e7e508..66905d0 100644
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -1 +1,4 @@
+/.DS_Store
 /controller/
+/model/
+/view/
diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class
index c29e2cf28d69f668bdd0e404b2af23f618b4920e..ea7ca53aa8395e3c563ec9856d1a747220b45103 100644
GIT binary patch
delta 17
ZcmbOsG((8v)W2Q(7#J9gHgX7X0suSc1)%@{

delta 17
ZcmbOsG((8v)W2Q(7#J8#HgX7X0suSm1)~4}

diff --git a/bin/model/BigDealStack.class b/bin/model/BigDealStack.class
index a820dd78f8686adda27f9227344758246a3b5ef1..5a27ad02598023c3d289cda48280aed948fe15a3 100644
GIT binary patch
delta 17
ZcmaFw^xlc%)W2Q(7#J9gHgcpZ0su`e2Oa<b

delta 17
ZcmaFw^xlc%)W2Q(7#J8#HgcpZ0su`o2Ot0d

diff --git a/bin/model/Card.class b/bin/model/Card.class
index fb749aae7b36d089877e41f60be6e465071910ff..282d93b279594840a911ec4768931ac0c2d89cdb 100644
GIT binary patch
delta 17
Zcmdnbyq}rl)W2Q(7#J9gHgard1OPxx25<lX

delta 17
Zcmdnbyq}rl)W2Q(7#J8#Hgard1OPx*266xZ

diff --git a/bin/model/CardStack.class b/bin/model/CardStack.class
index c976fdce4bc7aa9eaf2c1143bd3a627961b9927e..b0b95d2045e0a8035b7a34e43e82dc89b0d7ba80 100644
GIT binary patch
delta 29
lcmZ3&w}g-5)W2Q(7#J9gHgYUxoBW8)VDbt!^T|T&LI9|)3L*di

delta 29
lcmZ3&w}g-5)W2Q(7#J8#HgYUxn|zPWWbz6&<H<toLI9|=3LpRg

diff --git a/bin/model/CharityTile.class b/bin/model/CharityTile.class
index c4acea3addc0f8034ee376dd641c056a8f2dd191..6d5ff4b02382794b8da18891887a38921d547d5c 100644
GIT binary patch
delta 17
Zcmcb^e21Ci)W2Q(7#J9gHga5H1OP-P2FCyZ

delta 17
Zcmcb^e21Ci)W2Q(7#J8#Hga5H1OP-Z2FU;b

diff --git a/bin/model/ChildTile.class b/bin/model/ChildTile.class
index e8e1174d1e47eaa9f08aba2b34cff5746ea64d3f..b82e2e725467e1b494e4f5a1f29af2bed0853bba 100644
GIT binary patch
delta 17
Zcmcb{e2tmo)W2Q(7#J9gHgcR}1OP)?2DJbH

delta 17
Zcmcb{e2tmo)W2Q(7#J8#HgcR}1OP*12DbnJ

diff --git a/bin/model/DealCard.class b/bin/model/DealCard.class
index adc8ef1018ee1bef4a6db5029cf8d0d6ba615b69..9a51abb2d1f94f23ccf44d64d65a1a48066ae7bd 100644
GIT binary patch
delta 17
ZcmX@eagc-K)W2Q(7#J9gHgZ_9002NK1_J;9

delta 17
ZcmX@eagc-K)W2Q(7#J8#HgZ_9002NU1_b~B

diff --git a/bin/model/DealTile.class b/bin/model/DealTile.class
index 1cf47b28baf64709066193bdc7fcbf8e6a3d2f56..6b6791677692fccd3780788b133608e66acfbec9 100644
GIT binary patch
delta 1214
zcmZuvOH<QO6#j0Lk{Tl;;G;5v(UE~FP(iEG`Yt|DL9~dXqF&ld4WvnJQx#wJxpAji
z`3u~*5ohX*%(&8xJAa7_x9WJ3fL6!Fy}3E(eCPYVbMJiPrzZ9D&-Why^yBFp^%bi&
z&F~vMUU3XFp2>2{5~XG6!WIQFhLwKK<W@eOnJYV@pkXVz8A67|u==E*HSGA1RjfD}
zrzChGrJ@798kQr@5bgSJNo?F>=+j8Tc2<RCSDgB8qb0*y>J~wQAw6MNbP|yhIo-B&
zuIB_dbrLLk^~07UO8Pc^+Aitk0yoVdNq>EQY|6;{5f!^IpkOyc%aZDVr|QerkVJ|>
zDSF(dXKqn?;N78cJ{24H%<a{%5BnKpOWY#etGZ%=$@<C&4l=Ml6=@t+F!=W%{bm}D
z;3z|bNMEmTv-}U?si_%}byBelDpq1h!*QHoh!l<NY?_yH42?uuuyewUd;ckSQjVUX
z9xZ{A`nx1kVZ*x~(vxM->R}8kG7itq4)fv|pE8AlvkdB=zV7Q#vULI%6<i=>5Fa)9
zoG59ygvl4u0K4KQrPgVVtb!?$71RvU^?158<h(&e^1>N298;*^nAVWTHJUU9({`C;
zNnNoaFEgWI*2^?fX3)NAjq<sIupBQ%&(6X%_lvY9av4SMab0)6N^Q%^s3@QoQTMqV
z4Qsf8n{L0{>sI7v?BR>>m+D7I2-90nETCgz9-Z&dGdz!N%{yw?*<Hh)k)GxQH5_`0
z#(Au+;aF0Bh2=}fHw2Whp7u?M&>kh;b!b5=o!YSxI%2eUV>5Q32W?cb4-K>@D7%5a
zKsAAr7zQKY7L4E&LIiEYD8VEGOE`@)kO|HfPZ<I=A@l>?3OW>|ze7<lM(J^!qkRRX
z9}|aXsbgym=SLQBd4h~wr6p(?w9I#~lXA~GxrX+V=ON^KXeJ_{kFfouZ#$_@xRVWQ
ztARl3hg+DV+A#ULjXNZ+9SZK^9^n}7qq@j{fW9H>6d```77zX~sD6BaP)UCpYl6Dp
j(}?&C^bYZe*aJ5S_gh1>bAMeu`(4i#hsVgX=i<pPB4PxQ

delta 815
zcmZWmO-~b16g`i2m@*C!h=>}&m&V2x3I#0kDIf(DL_iBDekG6cgn{V{nR(%3)rE-*
zxAOyBx<(U7B#{Mi<IX?eZ}1lw@3aJBT-^Kan|sbZ=g#}y@VU<T@#pI|09m{_Fg~$T
z{ifIv8Cy8(nMu!cy%>@Vr%R3}eb?TRYrNnVw=G*J%XRp+=dRka=nrzECcp0}vBzad
zN^{HcrKfm&D9)8z=Gan6K5n~(t-KOS7Nw(nqeeLMtDCZ*ctJRht9WTu@^dL-3ce#e
zOOVRH3Y^rHyCoeSPsP*xd?c59+cb`RinmI7Ty0o>1!x#Zpv}Z3v@<j%XD{~5E6;M)
zhf>Q74Z*KS-}MZ-b#yV9MR!fwnFU+yOV30P?gW|WK(v?m!HL#XGSG(s9sLY-7372z
zc20O}CI&IY5L=gO(NeZ#xSUM=uNd<0nHa$+gHG6->nnyxGBq7`?wc47J9X5VaCe;r
zu^;}lur*;~5~Ho;H)IKaW6E}Sa~t$%(x8`o5N`P}(6yH88O-W<6trnAk;j+|X0*;g
zMVf*=?E`xeM5=$5vWTFH-rqPzVx{r+5mF~~tHKS+)nJr4S}2?4+CVFA(v2aF4$8Gu
zzayMRXQKTOopZ;?uA~ofmtvS=j3Rf0sljN+wdf(H4+vNp-iRpGwOz#Rrl~!+g>3L!
zZ!XPap{$j_6FeobMh@~=B%iI&v4mwJGCafcGyO3-!wq7jKl}wN7ZOJKdq1%T$~#=C
k;Ldg+Mp=Oo|0Stcw&@Mt$F8!G;A5=0zT$-8RoV3GzYJ})hX4Qo

diff --git a/bin/model/Die.class b/bin/model/Die.class
index 3884acdc0ea59f435994f97f2479919a24b61f02..e3194931b65f5d9a660bc4cc19420e416fb45445 100644
GIT binary patch
delta 17
Zcmeyz@{fh%)W2Q(7#J9gHgc3P0RTtI2Cx7C

delta 17
Zcmeyz@{fh%)W2Q(7#J8#Hgc3P0RTtS2C@JE

diff --git a/bin/model/DoodadCard.class b/bin/model/DoodadCard.class
index 8e23482787e8becfb58c7d537386959e55cca92c..538f41527019642a1730cd70361138e489689138 100644
GIT binary patch
delta 17
ZcmaFD{Dhg~)W2Q(7#J9gHgeoy1OP=g2HyYx

delta 17
ZcmaFD{Dhg~)W2Q(7#J8#Hgeoy1OP=q2H^kz

diff --git a/bin/model/DoodadStack.class b/bin/model/DoodadStack.class
index ddbe44ae56766d52b757a71d5322e6cdab843eac..f8c4af90ad74525bae7b8c75a54580cf1d2a843c 100644
GIT binary patch
delta 17
ZcmaE^^jwMK)W2Q(7#J9gHgd!Z0su%(2DShI

delta 17
ZcmaE^^jwMK)W2Q(7#J8#Hgd!Z0su%@2DktK

diff --git a/bin/model/DoodadTile.class b/bin/model/DoodadTile.class
index 916410a6c71cb3395a9779230dc18b0f4a51c994..2d599401cc63b8c3707d65826f8ccfe4701612cb 100644
GIT binary patch
delta 17
ZcmX@ga+HPR)W2Q(7#J9gHgec90RTWZ1_b~B

delta 17
ZcmX@ga+HPR)W2Q(7#J8#Hgec90RTWj1_uBD

diff --git a/bin/model/FinancialStatement.class b/bin/model/FinancialStatement.class
index ffcc68917ebdb477bef9e547d06cd16aac4be48d..c839fbd5f3c231353ad890bd74dbd6803c6bdf68 100644
GIT binary patch
delta 17
ZcmaE$^gxN@)W2Q(7#J9gHgZG=0su!~2B81|

delta 17
ZcmaE$^gxN@)W2Q(7#J8#HgZG=0su#92BQD~

diff --git a/bin/model/GameBoard.class b/bin/model/GameBoard.class
index 7a1eefb39f962105a748fd39446258b6a39e55a1..6812249f24c78120225810eeec0b950ff5ccea55 100644
GIT binary patch
delta 17
ZcmZ23xLlCq)W2Q(7#J9gHge48002J621@_{

delta 17
ZcmZ23xLlCq)W2Q(7#J8#Hge48002JG22B6}

diff --git a/bin/model/MarketCard.class b/bin/model/MarketCard.class
index 10982d5b30eb6ec1c99eb04f0d92f524b42f5c01..62aad7c1bd1d8b3cdd6ac6d6fce375b9d06af5fc 100644
GIT binary patch
delta 17
YcmZqWXyxEI^>5cc1_lPBjU0cO0Xi@SP5=M^

delta 17
YcmZqWXyxEI^>5cc1_lO`jU0cO0XjMcPyhe`

diff --git a/bin/model/MarketStack.class b/bin/model/MarketStack.class
index 6c75bff46a59f2bc9f99e0390e78540fcc41c8c5..cf1b1450edd0b4945cf8ad575445d36b7af90889 100644
GIT binary patch
delta 17
ZcmdlLzAK#L)W2Q(7#J9gHgasz1^`K<2QvTw

delta 17
ZcmdlLzAK#L)W2Q(7#J8#Hgasz1^`K}2Q>fy

diff --git a/bin/model/MarketTile.class b/bin/model/MarketTile.class
index 80040574f1700457729c531ee875df03efd9fa23..af03a6d97c9c833c8634cc24bf6059611e9d68a8 100644
GIT binary patch
delta 17
Zcmcc5bf1ai)W2Q(7#J9gHgbeB0sup922KC~

delta 17
Zcmcc5bf1ai)W2Q(7#J8#HgbeB0supJ22cP1

diff --git a/bin/model/OwnedRealEstate.class b/bin/model/OwnedRealEstate.class
index b9ca4f6486066cb69d8a5f3c5a603405543d43a9..500d944e88b7e5bee1f9e7201cba61332cafae66 100644
GIT binary patch
delta 17
YcmZo*Z(!#*^>5cc1_lPBjT{xs061s`y#N3J

delta 17
YcmZo*Z(!#*^>5cc1_lO`jT{xs06205zW@LL

diff --git a/bin/model/PaydayTile.class b/bin/model/PaydayTile.class
index fde1634463747847bcbbc1e31b1f1a930730a676..631fb20e8ba548235d382c7ce312c1ad7ae90c41 100644
GIT binary patch
delta 17
Zcmcc5bf1ai)W2Q(7#J9gHgbeB0sup922KC~

delta 17
Zcmcc5bf1ai)W2Q(7#J8#HgbeB0supJ22cP1

diff --git a/bin/model/Player.class b/bin/model/Player.class
index 8d9ffaec18379a960d43779eb96a96e670ba6a6e..7641f8b0d9a9fa0123cfde31e8ce1cdcc180078d 100644
GIT binary patch
delta 17
Zcmcb_eTkdn)W2Q(7#J9gHgcR|1pq_F2E70P

delta 17
Zcmcb_eTkdn)W2Q(7#J8#HgcR|1pq_P2EPCR

diff --git a/bin/model/Profession.class b/bin/model/Profession.class
index 8fdeb619cfbf0611443cdf9dd2e107bdaf0a3a90..8206775f8dfd9f979a18b9da8b87f2568dd1faa1 100644
GIT binary patch
delta 17
ZcmZ1~vQ&iQ)W2Q(7#J9gHgd>v0RTPU1<e2e

delta 17
ZcmZ1~vQ&iQ)W2Q(7#J8#Hgd>v0RTPe1<wEg

diff --git a/bin/model/Professions.class b/bin/model/Professions.class
index 044c822bf4274af0b6bf55d89cb024ce1992120a..72577b6cac8dfa13c3a10ca1c222bb76122ccb85 100644
GIT binary patch
delta 17
ZcmX@ae~6#s)W2Q(7#J9gHgfD@2LM7K2A2Q;

delta 17
ZcmX@ae~6#s)W2Q(7#J8#HgfD@2LM7U2AKc=

diff --git a/bin/model/SmallDealStack.class b/bin/model/SmallDealStack.class
index 143fd12a6cc2428f52713ca0b54d1bf75baa28e3..8b79e2031e7a0a4fa8dab3c9437c04c324ca73fc 100644
GIT binary patch
delta 17
ZcmeyV^izrB)W2Q(7#J9gHgXgS0su;~2J8R;

delta 17
ZcmeyV^izrB)W2Q(7#J8#HgXgS0su<92JQd=

diff --git a/bin/model/Stock.class b/bin/model/Stock.class
index 605e025a08d7c1f1be7c63ea31af813d17423fb1..b348dae0b521a9335c78b91d25973e4be58764b5 100644
GIT binary patch
delta 17
ZcmaFD`h=C^)W2Q(7#J9gHgeoy0suvG2IK$$

delta 17
ZcmaFD`h=C^)W2Q(7#J8#Hgeoy0suvQ2Ic?&

diff --git a/bin/model/Tile.class b/bin/model/Tile.class
index b7a9114e86d15842c253f0e786bcfce1876999cc..f5c5e59c36ccd93580a2c01e4c48919931060359 100644
GIT binary patch
delta 17
Zcmcc3d7G2t)W2Q(7#J9gHga5M0RTk12Gall

delta 17
Zcmcc3d7G2t)W2Q(7#J8#Hga5M0RTkB2Gsxn

diff --git a/bin/model/TileCircularLinkedList$Node.class b/bin/model/TileCircularLinkedList$Node.class
index 64dfb0fe95c1b08c36a11f9714d04a1ffbfb14c3..06495c62b9eb44a86ad89dfd78b75de5900060d9 100644
GIT binary patch
delta 29
lcmbQrHkD1_)W2Q(7#J9g7*yFAm>3xpCqHDA*{Ji92>^t32x0&L

delta 29
lcmbQrHkD1_)W2Q(7#J8#7*yFAm>3xpCqHDA*{Ji92>^tb2xI^N

diff --git a/bin/model/TileCircularLinkedList.class b/bin/model/TileCircularLinkedList.class
index 25771186acfde1a9f1f5f979a45b531dbe64c65a..36c46be926aa9bdf6f5fdadc51e680693a47e58e 100644
GIT binary patch
delta 28
kcmew={8d=s)W2Q(7#J9g7&6%zm>3ykCVrIJsB@AN0GNLXZvX%Q

delta 28
kcmew={8d=s)W2Q(7#J8#7&6%zm>3ykCVrIJsB@AN0GOW%aR2}S

diff --git a/bin/view/MainWindow$1.class b/bin/view/MainWindow$1.class
index 5c3d1450135fdafa939117a9b226d7f873b092a8..1c26d21fbb4cf0b54307f01e194d32252c83208b 100644
GIT binary patch
delta 17
ZcmZ3%wt|i0)W2Q(7#J9gHgYI10{}dl1+xGE

delta 17
ZcmZ3%wt|i0)W2Q(7#J8#HgYI10{}dv1+@SG

diff --git a/bin/view/MainWindow.class b/bin/view/MainWindow.class
index 2f9e5fe9b8c1f4e41fccb78795c937becc40f481..55b39c8b41651b38884e31d836cf79ed45e3b10d 100644
GIT binary patch
delta 17
ZcmdnWy_K8e)W2Q(7#J9gHgc?G1pq(n24(;N

delta 17
ZcmdnWy_K8e)W2Q(7#J8#Hgc?G1pq(x250~P

diff --git a/bin/view/MainWindow1$1.class b/bin/view/MainWindow1$1.class
index 589edb83217599a27107979691d10c2eb6a03a79..f40f2c6ae6e0719aa1aad1035721cb2ac79cfcb2 100644
GIT binary patch
delta 17
Zcmcb_dWn_e)W2Q(7#J9gHgcR|0sun~2Ce`A

delta 17
Zcmcb_dWn_e)W2Q(7#J8#HgcR|0suo92Cx7C

diff --git a/bin/view/MainWindow1.class b/bin/view/MainWindow1.class
index 077cd20fef976285bc547dc9000af61aba9a649c..68c09eb15e7b731ad4be45b9ef86ed2e866b698a 100644
GIT binary patch
delta 17
ZcmbQiF@uBS)W2Q(7#J9gHgX8C0026-1&9Cu

delta 17
ZcmbQiF@uBS)W2Q(7#J8#HgX8C0026{1&ROw

diff --git a/bin/view/Window.class b/bin/view/Window.class
index c68be936dff58fb320e6e1a871331e9afe1c4f25..fe71bb585cb9090b491f256af3681c5534b0e673 100644
GIT binary patch
delta 16
Ycmey%_?MC6)W2Q(7#J9gCUSfQ06@kE1poj5

delta 16
Ycmey%_?MC6)W2Q(7#J8#CUSfQ06@+M2LJ#7

diff --git a/src/model/DealTile.java b/src/model/DealTile.java
index ea1cf92..5cdebb3 100644
--- a/src/model/DealTile.java
+++ b/src/model/DealTile.java
@@ -29,7 +29,7 @@ public class DealTile extends Tile
 		Card c;
 		if(input.equals("1"))
 		{
-			c = _smallDealStack.pickCard()
+			c = _smallDealStack.pickCard();
 		}
 		else 
 		{
@@ -37,7 +37,8 @@ public class DealTile extends Tile
 		}
 		
 		// If stock, update price, then ask user if they want to buy and ask everyone if they want to sell:
-		if(c.getTitle().equals(anObject))
+		//if(c.getTitle().equals(anObject))
+	
 		// If property, ask user if they want to do it (and check if they can afford the down payment):
 		// If yes, call ButIncomeProperty method:
 		// Else, do nothing:

From f97939a02b6509a13107e992533df62a6b783f2b Mon Sep 17 00:00:00 2001
From: afortuna2016 <afortuna2016@50.28.178.145>
Date: Thu, 6 Apr 2017 16:37:20 -0400
Subject: [PATCH 2/2] tilesssss, had to change a few ints to doubles and
 added/changed a bunch of getters and setters, i dont't think i changed
 anything that affected the rest of the game though

---
 bin/model/CardStack.class          | Bin 1828 -> 1828 bytes
 bin/model/CharityTile.class        | Bin 476 -> 879 bytes
 bin/model/ChildTile.class          | Bin 470 -> 621 bytes
 bin/model/DoodadTile.class         | Bin 581 -> 1047 bytes
 bin/model/FinancialStatement.class | Bin 4448 -> 4557 bytes
 bin/model/Player.class             | Bin 1490 -> 1737 bytes
 src/model/CardStack.java           |   1 +
 src/model/CharityTile.java         |  18 +++++++++++++-----
 src/model/ChildTile.java           |   3 ++-
 src/model/DoodadTile.java          |  13 ++++++++++++-
 src/model/FinancialStatement.java  |   7 ++++++-
 src/model/Player.java              |  14 +++++++++++---
 12 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/bin/model/CardStack.class b/bin/model/CardStack.class
index b0b95d2045e0a8035b7a34e43e82dc89b0d7ba80..ce4fd7a0d792cf851c17bfef2ef0bad2658d84b9 100644
GIT binary patch
delta 108
zcmZ3&w}fwlAPc7m0}F#F11E#nWGNPRPH6@%1{nr^2HDA3EK$5l3>*x~3_=Vl4B`x`
zlP|KkF=|bgV6|b?pB&0MP1Ou2YtA6RU<H)7VbBKBrVI`Y)(nn7=*$oTB;y#|HVd$c
GFaiK+I}gDC

delta 108
zcmZ3&w}fwlAPc830}F!)11E#%WGNPRPALX125AO<2ARoOEK$6Q3>*wf3_=Xb4B`wb
zlP|KkF=|ehV6|b?n;gnIP1O`AYsMhJV9B7uV9lTnq)i#@fh-3GM+PT`5Fj1L;JR6W
HO@t8uWXBJy

diff --git a/bin/model/CharityTile.class b/bin/model/CharityTile.class
index 6d5ff4b02382794b8da18891887a38921d547d5c..d52244e9b809f4950740fec9adb142c48a94a0a1 100644
GIT binary patch
delta 515
zcmZ`#NlF7j6n&M11lo!NCY=})=b_t}I8V3`j0gb*L2=<KWh_icr&~-bWR+#MimP}F
zHx0V*0G`1sh&K>_*@B>0Q1xH&-hY314Zer9myf4s0E^hT)!tef;z&fGGw`}|Cat*x
zOEl#rM-l@J(KE*ut}Il<Wz}sm1P${<WejqpkzwdLm+m)NaIS3kOHovcVU7`ulA`fj
z5i*MAv675)Otdh`5GR-2sx9ntRal2E6|76;l{U;hzp20MriN*l5f}`~|1=yks>yEE
zq-a#Og+(Q#N}T1$DXO<b+<|B`s@Jk;mz}x{Z#{O@xmU6UPHS2s2Q|cx14GEzF^?J8
z1##ak`g_}?ozVp4+P=6r5~r5D<Lsu@LIeTYc|PkQ)`6L&m<pFX3=tSp*TYoXkJ)w%
z`P#XM`3K4fLZdf@Funcc5=S3&WRRfIbedrZUBu|VJ2;~BqdHi|3K&)i2f?~>gx3fM
Gu>J|hA9gkX

delta 91
zcmaFQc88hk)W2Q(7#J9g7$hcgy`5~pBtAKusn5X_D8vNBj2poWE+EOqzz8J87`VYC
ZSdxK<ffvXFDq|2~5CxKqKzWcxaR58%3o!ry

diff --git a/bin/model/ChildTile.class b/bin/model/ChildTile.class
index b82e2e725467e1b494e4f5a1f29af2bed0853bba..1c2f52b6d80bd140725df2a83ee1ef4dfbf265a3 100644
GIT binary patch
delta 237
zcmcb{{Fa65)W2Q(7#J9g7*r;5y{zYA5M>Z&XAom#;K|KTNzKs@$VseBE#hI2V31^F
z5KT`lam&n0%uCKp%n2?@EJ@8x%`0JKkkQcefhfn6wdP`wW{_oPkYQwyz@>(VL5@M5
zk%1$TJ0-<ABQqz3k%3ub;>V@l4h)P8OhDIhXm4W>*~TEX5y)m@-~y6dU~xVMb_M|k
fZXjO_qK<)wffvXF>R?b{Pz35`WKaU~m>84+_JT8u

delta 87
zcmaFMa*dhm)W2Q(7#J9g7$hcgy_{UnxY)rI$Ylaz#*JVG7m#FQU<8u<4BS9c3?j+E
W!@vvV0hKX`Fo*(4MxYExqc{NU847#=

diff --git a/bin/model/DoodadTile.class b/bin/model/DoodadTile.class
index 2d599401cc63b8c3707d65826f8ccfe4701612cb..aab4fc1727033edc9b58fc4325f7203cef8a09c2 100644
GIT binary patch
literal 1047
zcmZWn+fEZv6kVsS3`|c86j}jM0TJ7R)EizXpaLOjte2!sjZfy#nZW3DhLow%FYrH%
ziEk!eD2XP<XFtlg&a^?GFEjhH_TFpnb^iSQ@e9BWtQ&|33^jbqb_<)nZz-$lxVC|q
zfZ2&^UqHUJ!fYi__16L;<>Mt`uqY6#tEMH8I+5I9jJZD5@LOIWAWC#r9M1{X1Txw3
zEA>VdT;=T)DnZlnc8aB3jjc9F$wU-`5^+ca!ve!SGffO(L<2?zqS;(+0Bk9727Lm9
zWyiChv>MxXv#PfB4ym$VS8h!;9qo66v0&HPKh0V1toQL$BdqJ;$m?wTT&(0-_FIAY
zjvbU0ZR@E=p4sjJp1JCs-7My6n&-5{3@(x9p1&uM%;vhF@ID4EpOQg`^*UE14D_3r
zMNT4*d4YZot0}idX56`?L02UPV45i4x`As{t8=N&d`X>e3Zz-K<#@`gJIbYEf!(mR
z9+O8*db33nOSog;w!m1YWiLkJu4a{F`wg|fyRN8Zozg8~S)zy)ruI*yc-QQv)>!B}
zoII64B797b)m~R0v*Nd!b$cs(g@gZ}=%UsH(_B8vmmGzuRi_ov=L-M4Ncg8bki;eE
zJttD*hx7B3he-a!(2GN)z9Ic3gr4O$83N*LCaGEiV~kC8iZG4|dMw8|OtPi6&T~wJ
z_61z*4*5)Ugt=<|E7EOD{l@G8=JNUPm}?_@fQ9)s7TdVRz`{pNXzy6Wdf&#qPZ&QI
z`hd9hl1ylxQD~ks;hHHj93jV1%prqiW>)DvBF_qsqq%1~T#mR`iC81k`^?1<SxwV^
JKs$nm{{VjW-_8I4

delta 299
zcmbQvag>GY)W2Q(7#J9g7!)UR`A%%mHsa=CU}xZ9XW(UI5X{X_NzKuB$<I$oObISY
zOwQ(F;9=kgDG*>}VAjwK<78lD5Sn<mn2FJIvLB<8C?f-70V4yS4@6@?PGV(hk@e)2
zOd9o!3|tJX3~WHFn1FhKHULRZATOMO83-8|1huqfwli?;X5fk3&cL^sL2x5jsW6b_
z11sPHYUXAT06IVfD5e0>#30Hb2IK*?Gl(-t0F4B(BpIZ@mPj+mKrJz4umjo4z`%$w
fl?|*~3~ZVhL=tWqBZDl198jK-K^~}yi9rDX0D2=0

diff --git a/bin/model/FinancialStatement.class b/bin/model/FinancialStatement.class
index c839fbd5f3c231353ad890bd74dbd6803c6bdf68..b527dce92127679951eddfe19e01aa8236cfc3df 100644
GIT binary patch
delta 210
zcmaE$bXJ+`)W2Q(7#J9g7(Q&|D(8^nD^4wOPAtxFO3X>jOHO5EV9{{V3}a+qOaWq-
z&Gj6mjEwx7zjFRyWZX9S9rt`jhRuCEE-Y^L49q~tz`(Ah-nW(E)J7naiD5dB<O0$R
z40{>a81^yD0J6lue0GMJ46}edpazEL3@;dfhBLfmcs2R7fF|c523Cf{44e!{CjS)>
m=YGw=0hWEk@OHAipo;7Xuqix1F$SPIh$)N=?|?iehW7xGk1-$s

delta 110
zcmX@B{6LB8)W2Q(7#J9g7~X8;D(Bd|kfWH9k#Dmo*AGU<?UVU<<})&FUdQ9YGTB~G
zNqa8?E5kkpPKNyqGk{ve7?^-07sE`3SwI@Zdd|SXzzBpd7+y~95maG3Jb9y_DElj*
I923K90PnUOi~s-t

diff --git a/bin/model/Player.class b/bin/model/Player.class
index 7641f8b0d9a9fa0123cfde31e8ce1cdcc180078d..08caaff9177d174b3951c315d628f738c107129e 100644
GIT binary patch
literal 1737
zcmZ`(YflqF6g@*r3+?hMl(#@Bl~NuBMG<)@4>2SaNiZ1rLY8)cC1tDaqQOu8AU|jV
zl1SnY@JAWXY=^ck%a@&*J9E!H=bqdC`TOfPfJfK}qE0|NE98uPdONRQ7{ws`0<EX|
zCq13lt>g6D!&4(`3-}I>N&>x^^4ks5(ygqi=XY$~HqH#oUJwW#<O&v#0%BjF=^%Te
z7ft(Ot#ED;Kx_&$^TlVYWPUMJu<;;Y$m+IPuw?p)UV1Ngfko3Y?PV5Cj_nHg*T^pf
zA0ir>(Go<5K%3%REF2l767x$Tv?CHkmq7P@9OaW94ZY|iy<@}Pu4D^zB*&DtYIGrl
zPCSrB2Lz(YyZ2+ejSv{pP>+Dz4QpsbNbW{7gv+~!8np5*si6rC0xcQSGPcgo4vpeF
z{V>mdMKbI{ewXc%XBG6@Cnj6od|TGBhiw)g1ln(d6$K^U1a2G1zR`gwCEhhkpuZyZ
z?k!Q8$}X;z-IHRTXb4K;p^{;%FkMOROLH2O%O3^8yp}@BcKVZ>@?My{Ad%_?$#E1~
z7*kkk7Fw$4DxxWDb&TeWY|$CE{}WpYwf_HHb*ZOkmis2OQ#dbXjSW-wJzSpoDLL+l
zQK^qViva4RpWM|++0IH=ot2(CD;;%K`pH#eCI^$>R-V4X&rD!Cb&a+gwC`Obnn~TD
zb8q}7y06iHg~62X3NiVK%TGdnMt?YnWBd*)R6kKQ;`R}D2yI9pf)r;sjSjBha5{A`
zjtQPLj9?N|WFh!sTCqtxXP`cHiP3MB5&?#R9tTF!=K}>JFvEX_vXt87!SAl*0ng;e
zo|R|amE)etPcf$|FH@Qn7fAJ8VYb?ukP{sx+hk1(0*bpd?-`pXTQHC3URVh?)&#L8
z@4;H2%@S)7OA4#DBMG;t8BbBmp2;zH@|<V#3vU%Mw~9roSh`2WOQm9^GNSVwbm@6G
zwRee_KgVHo1FkS>wT4o-G9Ig*dg5+9uWOR4v$f{UAuc(@-5lPK!&VJUmBYF-i?99x
DlA#tl

literal 1490
zcmZ`%+fEZv6kVrRnGU4|3dqe;3bw<g2;R7e4^<M9MoBOjd})UE07IrTrZd&xlON=R
zCLoC<et;ik+-GK(4nuu8mwnD&d+oLMpTEC;16aj&5)lTuWj489+0)f?-cBOMkU3L7
zsTEx{PAYGY&UnLSh}MrShVh#FcSkc+qoJw#zOCB4#SMFtp}*cZRoj|<UNt)grLbLw
zbiHYQHZ1K6_kw+O-E63~W*Q91`l)KY7bo_CA+e<yn!Qb>O63EFSd~~wh$1VaAL%59
z7_uJIwt37gi!dw+gUBW^!Z7wfX5!13jQbcTiYMIO^RpR-OJ%R4Zgf*Z4wItj6hp3b
z_q}}32ZjeS;z)?ojEp4iiPNl%KKC>yLvl|KWuzc84AeA(zv;A&c>A4tq;rPB8Y!V4
zkYwWS1!MN9Mnb1=$~vZyxa=dt&`r?qz@nGLjfkWh$(W-S@7lvK>9>0KRhZW_4YIQ8
zI>?Z+xGng(PQ^;Q!V{*^1L1ccs3y5QKrt`VvpLt~jkYrwx8oW5`RevWjCx;NM)*bA
zH#_YH-_e9xDR(}X#b{!N#E#Mk#}N@O&?zE3aCUOQ*-3wAC-rHUD1*j`)&aVGMT|0l
z73B(<YYZM<VYsGTBX_v)6Qfs{xWu#)y+mFt1+f&xGXKLtEYVtU&{KrdPxxs}5N;kB
z%pnVfCa!`Zl<D7yTZdu`bdyoUB9@2+!!rGG*@&IdYh1a&{5Lv8AW9^h;Ftp=yB|Cl
zh7~-bh-f94JpDbCJk>LK)vvrrAfj?48ZJ8<$c*@9*YMaYyG<m8f(eDRDt2{|oM?$$
zDLV*m{|OI4H1&j(6IGw$nTHi@p%^Bz6d)4!i9GL_oDV0j^-Ny(=U|<tNc5jl4lj_8
yHOcXCE9*2m8v&S<&tan{heDXc%Rq9sfz93=3W7r+%;7b0*a^UNIczzGzxW3><Md|$

diff --git a/src/model/CardStack.java b/src/model/CardStack.java
index da79c68..d80bbf8 100644
--- a/src/model/CardStack.java
+++ b/src/model/CardStack.java
@@ -1,6 +1,7 @@
 package model;
 
 import java.util.ArrayList;
+
 import java.util.LinkedList;
 import java.util.Random;
 import java.util.Stack;
diff --git a/src/model/CharityTile.java b/src/model/CharityTile.java
index 8400994..35d4f34 100644
--- a/src/model/CharityTile.java
+++ b/src/model/CharityTile.java
@@ -12,13 +12,21 @@ public class CharityTile extends Tile
 	@Override
 	public void getLandedOn(Player p)
 	{
+		
 		// TODO
 		// Ask players if they want to donate to charity (returns boolean)
-		// If true:
-		// 		Set players charity coutner to 3
-		//		Take money from them (check board for deets)
-		// else:
-		// 		Nothin
+		
+		if (p.donateCharity())
+		{
+			p.setCharityCount(p.getCharityCount() + 3);
+			p.getFinancialStatement().setCashBalance(p.getFinancialStatement().getCashBalance() 
+					- (p.getFinancialStatement().getPassiveIncome()*.10));
+		}
+		else
+		{
+			//you're an asshole
+		}
+		
 	}
 	
 }
diff --git a/src/model/ChildTile.java b/src/model/ChildTile.java
index 434fbff..bdc42fa 100644
--- a/src/model/ChildTile.java
+++ b/src/model/ChildTile.java
@@ -11,7 +11,8 @@ public class ChildTile extends Tile
 	@Override
 	public void getLandedOn(Player p)
 	{
-		// Increment child counter using addChild() method in financial statement
+		p.getFinancialStatement().addChild();
+		
 	}
 	
 }
diff --git a/src/model/DoodadTile.java b/src/model/DoodadTile.java
index 314d14a..89ac791 100644
--- a/src/model/DoodadTile.java
+++ b/src/model/DoodadTile.java
@@ -3,7 +3,8 @@ package model;
 public class DoodadTile extends Tile
 {
 	private static DoodadStack _doodadStack;
-	
+	private DoodadCard card;
+	private int amount;
 	
 	public DoodadTile(String name, int boardIndex)
 	{
@@ -14,6 +15,16 @@ public class DoodadTile extends Tile
 	@Override
 	public void getLandedOn(Player p)
 	{
+		card = (DoodadCard) _doodadStack.pop();
+		amount = card.getValue();
+		if (p.getFinancialStatement().getCashBalance() > amount)
+			{
+				p.getFinancialStatement().setCashBalance(p.getFinancialStatement().getCashBalance() - amount);
+			}
+		else if(p.getFinancialStatement().getCashBalance() < amount)
+			{
+				p.getFinancialStatement().setCashBalance(0);
+			}
 		// Pop next card
 		// Get cash out from card
 		// Check if player has enough money to pay in full
diff --git a/src/model/FinancialStatement.java b/src/model/FinancialStatement.java
index 4a718dd..0b8ece4 100644
--- a/src/model/FinancialStatement.java
+++ b/src/model/FinancialStatement.java
@@ -107,7 +107,7 @@ public class FinancialStatement
 		// TODO add method to update display if its currently being displayed
 	}
 	
-	private int getPassiveIncome()
+	int getPassiveIncome()
 	{
 		int passiveInc = 0;
 		for(OwnedRealEstate re : _realEstate)
@@ -184,6 +184,11 @@ public class FinancialStatement
 		return _cashBalance;
 	}
 
+	public void setCashBalance(double d)
+	{
+		_cashBalance = (int) d;
+	}
+	
 	public void increaseCashBalance(int cashIncrease)
 	{
 		this._cashBalance =+ cashIncrease;
diff --git a/src/model/Player.java b/src/model/Player.java
index 8fd7f8a..57994ff 100644
--- a/src/model/Player.java
+++ b/src/model/Player.java
@@ -3,6 +3,7 @@ package model;
 public class Player
 {
 	private FinancialStatement _fs; 
+	private boolean _donate;
 	private int _charityCount; //charity counter
 	private int _downsizeCount; //down size counter
 	private int _location;
@@ -31,8 +32,11 @@ public class Player
 	
 	public boolean donateCharity()
 	{
-		//
-		return false;
+		return _donate;
+	}
+	public void setCharity(boolean charityq)
+	{
+		_donate = charityq;
 	}
 	
 	public void setLocation(int i)
@@ -51,7 +55,11 @@ public class Player
 		return _charityCount;
 	}
 
-
+	public void setCharityCount(int charityCount)
+	{
+		_charityCount = charityCount;
+	}
+	
 	public void decrementCharityCount()
 	{
 		_charityCount--;