From c175f7562ae53c11e5d15c0e3dfccea2bb0fc5b6 Mon Sep 17 00:00:00 2001
From: afortuna2016 <afortuna2016@137.99.206.107>
Date: Fri, 21 Apr 2017 14:08:14 -0400
Subject: [PATCH 01/10] changes made

---
 bin/.gitignore                              |   6 ------
 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 887 -> 887 bytes
 bin/model/ChildTile.class                   | Bin 621 -> 621 bytes
 bin/model/DealCard.class                    | Bin 1089 -> 1089 bytes
 bin/model/DealTile.class                    | Bin 1764 -> 1764 bytes
 bin/model/Die.class                         | Bin 638 -> 638 bytes
 bin/model/DoodadCard.class                  | Bin 484 -> 484 bytes
 bin/model/DoodadStack.class                 | Bin 4641 -> 4641 bytes
 bin/model/DoodadTile.class                  | Bin 1096 -> 1096 bytes
 bin/model/DownsizeTile.class                | Bin 545 -> 545 bytes
 bin/model/FinancialStatement.class          | Bin 4692 -> 4692 bytes
 bin/model/GameBoard.class                   | Bin 3916 -> 3916 bytes
 bin/model/Handler.class                     | Bin 741 -> 741 bytes
 bin/model/MarketCard.class                  | Bin 1029 -> 1029 bytes
 bin/model/MarketStack.class                 | Bin 11194 -> 11194 bytes
 bin/model/MarketTile.class                  | Bin 473 -> 473 bytes
 bin/model/OwnedRealEstate.class             | Bin 896 -> 896 bytes
 bin/model/PaydayTile.class                  | Bin 351 -> 351 bytes
 bin/model/Player.class                      | Bin 1832 -> 1832 bytes
 bin/model/Profession.class                  | Bin 2597 -> 2597 bytes
 bin/model/Professions.class                 | Bin 1965 -> 1965 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/CharityWindow$1.class              | Bin 692 -> 692 bytes
 bin/view/CharityWindow$2.class              | Bin 1141 -> 1141 bytes
 bin/view/CharityWindow$3.class              | Bin 713 -> 713 bytes
 bin/view/CharityWindow.class                | Bin 2612 -> 2612 bytes
 bin/view/ChildWindow$1.class                | Bin 680 -> 680 bytes
 bin/view/ChildWindow$2.class                | Bin 1088 -> 1088 bytes
 bin/view/ChildWindow.class                  | Bin 2399 -> 2399 bytes
 bin/view/DealCardWindow$1.class             | Bin 698 -> 698 bytes
 bin/view/DealCardWindow$2.class             | Bin 698 -> 698 bytes
 bin/view/DealCardWindow$3$1.class           | Bin 720 -> 720 bytes
 bin/view/DealCardWindow$3$2.class           | Bin 720 -> 720 bytes
 bin/view/DealCardWindow$3.class             | Bin 1683 -> 1683 bytes
 bin/view/DealCardWindow$4$1.class           | Bin 720 -> 720 bytes
 bin/view/DealCardWindow$4$2.class           | Bin 720 -> 720 bytes
 bin/view/DealCardWindow$4.class             | Bin 1687 -> 1687 bytes
 bin/view/DealCardWindow.class               | Bin 3590 -> 3590 bytes
 bin/view/DoodadCardWindow$1.class           | Bin 710 -> 710 bytes
 bin/view/DoodadCardWindow$2.class           | Bin 964 -> 964 bytes
 bin/view/DoodadCardWindow.class             | Bin 2378 -> 2378 bytes
 bin/view/DownSizeWindow$1.class             | Bin 719 -> 719 bytes
 bin/view/DownSizeWindow.class               | Bin 2194 -> 2194 bytes
 bin/view/FSWindow.class                     | Bin 1607 -> 6504 bytes
 bin/view/GameboardWindow.class              | Bin 5533 -> 5533 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 1112 -> 1112 bytes
 bin/view/Positioner.class                   | Bin 974 -> 974 bytes
 bin/view/SDStockCardWindow$1.class          | Bin 716 -> 716 bytes
 bin/view/SDStockCardWindow$2.class          | Bin 1150 -> 1150 bytes
 bin/view/SDStockCardWindow$3.class          | Bin 737 -> 737 bytes
 bin/view/SDStockCardWindow.class            | Bin 2839 -> 2839 bytes
 bin/view/TileButton.class                   | Bin 1204 -> 1204 bytes
 bin/view/Window.class                       | Bin 253 -> 253 bytes
 src/view/DealCardWindow.java                |   6 +++---
 src/view/FSWindow.java                      |   6 +++---
 66 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/bin/.gitignore b/bin/.gitignore
index 4a6964c..66905d0 100644
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -1,10 +1,4 @@
-<<<<<<< HEAD
-/view/
-/controller/
-/model/
-=======
 /.DS_Store
 /controller/
 /model/
 /view/
->>>>>>> branch 'master' of https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git
diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class
index 13f0cc3c64fc98e214ad65a393f3679342b7193b..00469c65d918874fb2f4d9c44cd63d18f2493b5b 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 d9e4bf91d77e8940b9adac3ddc072f4a7d4d563c..ce4fd7a0d792cf851c17bfef2ef0bad2658d84b9 100644
GIT binary patch
delta 17
ZcmZ3&w}g-5)W2Q(7#J9gHgd?Y0{}e+1-k$M

delta 17
ZcmZ3&w}g-5)W2Q(7#J8#Hgd?Y0{}e`1-$?O

diff --git a/bin/model/CharityTile.class b/bin/model/CharityTile.class
index 80cfd9721fc1e82e383149e0fc449453f19e49c1..0d2d5535b9ca1f964ccb14003cd423ad465873ab 100644
GIT binary patch
delta 17
Zcmey)_MMI6)W2Q(7#J9gHge=M0{}-D2A}`{

delta 17
Zcmey)_MMI6)W2Q(7#J8#Hge=M0{}-N2BH7}

diff --git a/bin/model/ChildTile.class b/bin/model/ChildTile.class
index 54da5e45ce993ef78b9d871fc8768c8ff0757018..1c2f52b6d80bd140725df2a83ee1ef4dfbf265a3 100644
GIT binary patch
delta 17
ZcmaFM@|K0;)W2Q(7#J9gHgcpg0RTmZ27Lek

delta 17
ZcmaFM@|K0;)W2Q(7#J8#Hgcpg0RTmj27dqm

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 7d9238f751af57726f7b2af5ec591975942d5d68..a4bd343d492e3fa6885e358fd9b597f7c7f4b49e 100644
GIT binary patch
delta 17
ZcmaFD`-GR{)W2Q(7#J9gHgeoy0{}*62KWE~

delta 17
ZcmaFD`-GR{)W2Q(7#J8#Hgeoy0{}*G2KoR1

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 b3885f089cd71bac9ab5a75af89efef1047bf106..f68cac129fde1cbb2617dd8aca6ca08031ebaa3a 100644
GIT binary patch
delta 17
ZcmZ3evQUNN)W2Q(7#J9gHgZS`0RTTg1?d0)

delta 17
ZcmZ3evQUNN)W2Q(7#J8#HgZS`0RTTq1?vC+

diff --git a/bin/model/DoodadTile.class b/bin/model/DoodadTile.class
index 7e73a9ee213d4ceedac6e8d7ab819d5248680565..21293092f08ec3f65578169d387bb976657ee3ba 100644
GIT binary patch
delta 17
ZcmX@Xae{;6)W2Q(7#J9gHgY(y002Q31{eSU

delta 17
ZcmX@Xae{;6)W2Q(7#J8#HgY(y002QD1{weW

diff --git a/bin/model/DownsizeTile.class b/bin/model/DownsizeTile.class
index 058fe38505312d624c853def13952f1feca4ea79..60b4d983b372cf73c65da8877b0a07eae7e6a095 100644
GIT binary patch
delta 17
ZcmZ3;vXF)2)W2Q(7#J9gHgZTZ0RTI11(^T<

delta 17
ZcmZ3;vXF)2)W2Q(7#J8#HgZTZ0RTIB1)Bf>

diff --git a/bin/model/FinancialStatement.class b/bin/model/FinancialStatement.class
index 14738b8d04baece62bfdb60049dcdbc7bd83cc01..fdcff01ded035e198d88d390f5261c96dc33aa39 100644
GIT binary patch
delta 17
Zcmcbjaz%yX)W2Q(7#J9gHgfm~0RTn?27&+p

delta 17
Zcmcbjaz%yX)W2Q(7#J8#Hgfm~0RTo127~|r

diff --git a/bin/model/GameBoard.class b/bin/model/GameBoard.class
index d75668dcfffefa4bf642f9d96fed7e7cce8801f9..6fed27568e03eb0fd46219a6a8d0521e1a08945b 100644
GIT binary patch
delta 17
ZcmX>jcSerm)W2Q(7#J9gHgdS|0{}!m23r6C

delta 17
ZcmX>jcSerm)W2Q(7#J8#HgdS|0{}!w23-IE

diff --git a/bin/model/Handler.class b/bin/model/Handler.class
index 168fca9f0006f3bd9506aa83659ccce633696c44..3a3c5f59d85d3fb96ec031ff1ddd978283b47ce4 100644
GIT binary patch
delta 17
ZcmaFL`jnO9)W2Q(7#J9gHgeo$0suvo2Il|(

delta 17
ZcmaFL`jnO9)W2Q(7#J8#Hgeo$0suvy2I&9*

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 c4b9bfad5faecb1f9330a724c08a6601f9b74ee7..b3c3a8b11672e62c7d38b6a3fa0d8e34b38ea18c 100644
GIT binary patch
delta 17
Zcmcb~e3O~u)W2Q(7#J9gHga5K1OP+82EG6Q

delta 17
Zcmcb~e3O~u)W2Q(7#J8#Hga5K1OP+I2EYIS

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 980dae058b066caa6a7e59d85b1fef478aa3e449..3ac14dfc1253d061a451fcd7ad52f8952763d00b 100644
GIT binary patch
delta 17
ZcmZ3%w}Ox3)W2Q(7#J9gHgYJi0{}ga1;+pY

delta 17
ZcmZ3%w}Ox3)W2Q(7#J8#HgYJi0{}gk1<3#a

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 41ab535e369e58462b656f25eb1a646089092b5e..491de071ee1312c4f61c26d1da4b732dee483315 100644
GIT binary patch
delta 17
ZcmZ3>zm}il)W2Q(7#J9gHgYUw2LL}-23P<9

delta 17
ZcmZ3>zm}il)W2Q(7#J8#HgYUw2LL}{23i0B

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 6f236dedd0e3a7fe66c921a26d94e979e91256a1..655ebd0205eee2bbada14fa00fb91439f57b9570 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/CharityWindow$1.class b/bin/view/CharityWindow$1.class
index e815cf81aea154aa9fa03eaeb7c9df1963862249..f38a143228dc335dd84c844977e3d5d669964701 100644
GIT binary patch
delta 17
ZcmdnOx`mbF)W2Q(7#J9gHgc?C0sub~22=n5

delta 17
ZcmdnOx`mbF)W2Q(7#J8#Hgc?C0suc9237z7

diff --git a/bin/view/CharityWindow$2.class b/bin/view/CharityWindow$2.class
index 2dee356c24fde4658c8057aa0c1d5c0e2e6ef6d8..d41d3119efc7d9da33fa22c68bbfcf500f5c183d 100644
GIT binary patch
delta 17
Zcmey$@s)$))W2Q(7#J9gHge>$002i32A==`

delta 17
Zcmey$@s)$))W2Q(7#J8#Hge>$002iD2B81|

diff --git a/bin/view/CharityWindow$3.class b/bin/view/CharityWindow$3.class
index 275ba13ce904975e13e8e3f8279e3d691567c848..6e12f734b123592588de5eeadb515f6b22219582 100644
GIT binary patch
delta 17
ZcmX@fdXkmn)W2Q(7#J9gHgX(f0sukX29p2)

delta 17
ZcmX@fdXkmn)W2Q(7#J8#HgX(f0sukh29*E+

diff --git a/bin/view/CharityWindow.class b/bin/view/CharityWindow.class
index b5cac5e674f3ba57d68243dda7e68605a022a77c..3415f45390f964a4cf1fe3c2c3d2015ad13408a6 100644
GIT binary patch
delta 17
ZcmdlYvPFdB)W2Q(7#J9gHgf220RTVU1^NI0

delta 17
ZcmdlYvPFdB)W2Q(7#J8#Hgf220RTVe1^fU2

diff --git a/bin/view/ChildWindow$1.class b/bin/view/ChildWindow$1.class
index a63c280d149bec193fe6df3077ff1d6adc8f3185..efd900fcf07eef43eaa55a6574580ffee267b680 100644
GIT binary patch
delta 17
ZcmZ3%x`LJC)W2Q(7#J9gHgYUr0suXG1~32s

delta 17
ZcmZ3%x`LJC)W2Q(7#J8#HgYUr0suXQ1~LEu

diff --git a/bin/view/ChildWindow$2.class b/bin/view/ChildWindow$2.class
index 35fa16f1888e7b11e172bc32e32183707bbc9243..01203297261b5917d65f06b7ab98c5c06f2dddc6 100644
GIT binary patch
delta 17
ZcmX@Wae#y4)W2Q(7#J9gHgZ_7002M-1^@s6

delta 17
ZcmX@Wae#y4)W2Q(7#J8#HgZ_7002M{1_A&8

diff --git a/bin/view/ChildWindow.class b/bin/view/ChildWindow.class
index 00056a14cebab156919bce82a67886198feb83de..6f698fb42f1d281acfe68cf0826f975e6874cf56 100644
GIT binary patch
delta 17
ZcmcaFbYF<$)W2Q(7#J9gHgbe>0suu;26g}d

delta 17
ZcmcaFbYF<$)W2Q(7#J8#Hgbe>0suu|26zAf

diff --git a/bin/view/DealCardWindow$1.class b/bin/view/DealCardWindow$1.class
index ac4aceb14e4abc361a5ff07de31cad9600bc5cd5..698118baa12d0fc2c800282f59be215717d9a9de 100644
GIT binary patch
delta 17
ZcmdnRx{H<L)W2Q(7#J9gHgarY0sueX24(;N

delta 17
ZcmdnRx{H<L)W2Q(7#J8#HgarY0sueh250~P

diff --git a/bin/view/DealCardWindow$2.class b/bin/view/DealCardWindow$2.class
index 62114ffbd43ec99720e33dded6b8ba96b98638a3..69547f0bb00e1b51aed9a57b4b71db138b6b0afc 100644
GIT binary patch
delta 17
ZcmdnRx{H<L)W2Q(7#J9gHgarY0sueX24(;N

delta 17
ZcmdnRx{H<L)W2Q(7#J8#HgarY0sueh250~P

diff --git a/bin/view/DealCardWindow$3$1.class b/bin/view/DealCardWindow$3$1.class
index e0a922b1d2fa7775a7040b1f65a5ea445f25b768..96db31e851d7f871af3749d45254148f4ac3f193 100644
GIT binary patch
delta 28
kcmcb>dVy8o)W2Q(7#J9g7}VGqm>3zvCr%XIsJfa70EbKnE&u=k

delta 28
kcmcb>dVy8o)W2Q(7#J8#7}VGqm>3zvCr%XIsJfa70EcV{FaQ7m

diff --git a/bin/view/DealCardWindow$3$2.class b/bin/view/DealCardWindow$3$2.class
index 75eab6a985c7cc88bc02682520e0353c3996d513..7af86cd5f5ca9b6c21258c99ab768a3a2fdc5f59 100644
GIT binary patch
delta 28
kcmcb>dVy8o)W2Q(7#J9g7}VGqm>3zvCr%XIsJfa70EbKnE&u=k

delta 28
kcmcb>dVy8o)W2Q(7#J8#7}VGqm>3zvCr%XIsJfa70EcV{FaQ7m

diff --git a/bin/view/DealCardWindow$3.class b/bin/view/DealCardWindow$3.class
index 9906e71e7dc098f3cf6ff0c96d760d253662aec2..a57b468141ee8ddb3862f4be019cc53be0ce2d26 100644
GIT binary patch
delta 17
ZcmbQtJDHc`)W2Q(7#J9gHga^c0RTIt1_b~B

delta 17
ZcmbQtJDHc`)W2Q(7#J8#Hga^c0RTI%1_uBD

diff --git a/bin/view/DealCardWindow$4$1.class b/bin/view/DealCardWindow$4$1.class
index a938d08adb4c7e062b39f24f69c7d2f765dbb255..2d1cd226ba46d787e7e8c9a850cb43635b4d5162 100644
GIT binary patch
delta 28
kcmcb>dVy8o)W2Q(7#J9g7}VGqm>3zvCr%XIsJfa70EbKnE&u=k

delta 28
kcmcb>dVy8o)W2Q(7#J8#7}VGqm>3zvCr%XIsJfa70EcV{FaQ7m

diff --git a/bin/view/DealCardWindow$4$2.class b/bin/view/DealCardWindow$4$2.class
index 111e7c726beab4230a939d25476765e056d8c378..f06db0349e89b753d9960baf2cada14acf92cd1d 100644
GIT binary patch
delta 28
kcmcb>dVy8o)W2Q(7#J9g7}VGqm>3zvCr%XIsJfa70EbKnE&u=k

delta 28
kcmcb>dVy8o)W2Q(7#J8#7}VGqm>3zvCr%XIsJfa70EcV{FaQ7m

diff --git a/bin/view/DealCardWindow$4.class b/bin/view/DealCardWindow$4.class
index dad01a226493c3a5d30823681397293b234c96d5..e4ed6d360d0963101317cdb149c010a288538972 100644
GIT binary patch
delta 17
ZcmbQvJDr!~)W2Q(7#J9gHgfc{0RTKL1`z-N

delta 17
ZcmbQvJDr!~)W2Q(7#J8#Hgfc{0RTKV1`_}P

diff --git a/bin/view/DealCardWindow.class b/bin/view/DealCardWindow.class
index f81b2f9516fde6440856ff65a24e571d9f576be0..bd6667d628d6d58d374851f97ba128c843d94212 100644
GIT binary patch
delta 29
lcmZpZX_FB+^>5cc1_lNrhP~_zOpFY|lN(uuH!45o1ptd`2$28)

delta 29
lcmZpZX_FB+^>5cc1_lNbhP~_zOpFY|lN(uuH!45o1pteT2$KK+

diff --git a/bin/view/DoodadCardWindow$1.class b/bin/view/DoodadCardWindow$1.class
index 63ad1b1e87409b6d77c892159095ad8b96849f15..155e8d5c1e0411cafbe051bfe8fde17739856223 100644
GIT binary patch
delta 17
ZcmX@cdW@Ch)W2Q(7#J9gHgfD^0sujG28sXx

delta 17
ZcmX@cdW@Ch)W2Q(7#J8#HgfD^0sujQ28;jz

diff --git a/bin/view/DoodadCardWindow$2.class b/bin/view/DoodadCardWindow$2.class
index da8c80fee58aceb9b6e13e34155ffd0aef1cc804..4c4c3be564cd50ff7ed9ac5d8b05a1655f114478 100644
GIT binary patch
delta 28
kcmX@YeuQ1%)W2Q(7#J9g7|hujm>3zvCr%XIs5+k+0EPnyAOHXW

delta 28
kcmX@YeuQ1%)W2Q(7#J8#7|hujm>3zvCr%XIs5+k+0EQz7A^-pY

diff --git a/bin/view/DoodadCardWindow.class b/bin/view/DoodadCardWindow.class
index 65ca86fc0bb27bb47b7a8e1a71bf3446665ed9b9..6d446738a1193b3d4de9dd8dd58b77147425d77a 100644
GIT binary patch
delta 17
ZcmX>lbV`Wh)W2Q(7#J9gHgY&|0sumc1~&iz

delta 17
ZcmX>lbV`Wh)W2Q(7#J8#HgY&|0summ1~~u#

diff --git a/bin/view/DownSizeWindow$1.class b/bin/view/DownSizeWindow$1.class
index f33d97ee57040630b71d78a1e058be216ddee04e..52f3a74ea5b4a36250848aac4126a12bf775e893 100644
GIT binary patch
delta 17
ZcmX@ldY+Zz)W2Q(7#J9gHgX(i0sum(2BiQ1

delta 17
ZcmX@ldY+Zz)W2Q(7#J8#HgX(i0sum@2B!c3

diff --git a/bin/view/DownSizeWindow.class b/bin/view/DownSizeWindow.class
index 506d0a8b5c5d6b60bbe956f40a3548e4b48a4228..dcded3fa39b5f10cc9b8f1d986d32b18c0796600 100644
GIT binary patch
delta 29
lcmbOvI7v|8)W2Q(7#J9g7`oUQm>3y^Co8fFZ&c3b004z92ZsOv

delta 29
lcmbOvI7v|8)W2Q(7#J8#7`oUQm>3y^Co8fFZ&c3b004zh2Z;ax

diff --git a/bin/view/FSWindow.class b/bin/view/FSWindow.class
index 701d99f6eceda0ee81472fb47c864b2c34df3e0d..86276a900c6f04ac0921ec721167b7a444f4ca6f 100644
GIT binary patch
literal 6504
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
ae7e|~^A)i~Dkqk*7|3@5!OtMhzyAk~%ZAYa

delta 896
zcmaJ<TTc@~7(LsTOV<@cF>(=fKrY+Tx(FyYQ9&pa(U4Ry^=(Rrc6Gbc%x)<qCcOIK
zi`hTmU(lE~kwhO&O#BJH`xksM&Mp`YF}}=X&Ue1^o%8K}pZu(;Uw(f02w)ly-l`+Y
zQ5$*`TzE$JsbNvOXsimsMLYTwyx6t{bGWt73S^g;E2c$VliQ>sc-~^=d7?%iml!EC
zx5Nt)Wfdye+IB|YvS^)&I5BPFN`hOjFp|zbG3^4c5z`?ycL}XjEOVFUhb%_+xCn?;
z6su)syAILgs)}y(YtS&@4TgJ;6sUhDDCpET%e=rW<7C!Ce5W0Q3SR%;vg3Qs)@_#_
z5a#D3GLFliGn)+UR)vtW)7haUk;2TC#!J#{P*&&uj#^}HmReNQb(zs2RlC6UOj~a0
zcaR`)))l5*RJ}fJK`wbjLCjzBf#K97Y;0^%n^`J`G3JNV6-4x>@trm#&Js6i-Y3S<
z?;j}**I_8Q<S=)g3-gf6G}e-37HxlZzD&lKxuKvd_^7nz8l!8%ENs#`uevHGFy&92
zR?wnnB-i(FOT!Fiy;q@x-1{)*H7ww^_boK#z0r*I4yVLx%T?Fq_6jTWC=}e+(1KPK
zt5|D8`mE)&pk=0E-H)Y8qdTT!%3sF&sttHQw8NtW!cqfJkI|ir^)_+&lYE8HDbLoR
z(v4Vv_~;c}l~{*-Ps_fLyifYbKl<`PpLU{-E?kuC2!?R&RN<wx9Z5+rd5qy)xQWq+
z$B5^~n;3tT3OA6H_(U!eX=1X0o5@rIbKbk2#aS%kj+BT>p}ROIO~lZLduR^~E#dsB
b{EV#l!J>)xSdKKX;*Is{Q3V-^g|P7po=n)8

diff --git a/bin/view/GameboardWindow.class b/bin/view/GameboardWindow.class
index 06f8a0b2c92dd6de15bb927885ac76e1feae25f9..ee0b30340399ca85cc6dfecfb61d401877543792 100644
GIT binary patch
delta 17
ZcmbQMJy)CK)W2Q(7#J9gHgZfA1pq*d25tZV

delta 17
ZcmbQMJy)CK)W2Q(7#J8#HgZfA1pq*n25<lX

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 0300272617c3847dcbd412760c2f914c3ef0ca73..072003103b479c243dfafddd69a6fdae9446a085 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 edc924e3c73e6e1536f11521078c514c9ded69e7..9d49cf6cc888cd044ad4e4a20b88277aaac35004 100644
GIT binary patch
delta 17
Zcmcb?af5^7)W2Q(7#J9gHgW{8002Wb21oz^

delta 17
Zcmcb?af5^7)W2Q(7#J8#HgW{8002Wl21)<`

diff --git a/bin/view/Positioner.class b/bin/view/Positioner.class
index 32ebf821b6339327bbb34f5eeaa767a58b192f4d..588f16bfaadcfc52b7eb7719b53e97cfd84ca355 100644
GIT binary patch
delta 17
ZcmX@devX~v)W2Q(7#J9gHgX(e1^`0D2B!c3

delta 17
ZcmX@devX~v)W2Q(7#J8#HgX(e1^`0N2B`o5

diff --git a/bin/view/SDStockCardWindow$1.class b/bin/view/SDStockCardWindow$1.class
index c11d6780367841703dc99538cc5c71ecf7c7af96..09d4e6ff2791810622e7b1aed71000620163e393 100644
GIT binary patch
delta 17
ZcmX@ZdWMzb)W2Q(7#J9gHgX(c0sulo2Alu@

delta 17
ZcmX@ZdWMzb)W2Q(7#J8#HgX(c0suly2A%)_

diff --git a/bin/view/SDStockCardWindow$2.class b/bin/view/SDStockCardWindow$2.class
index aab4f8a780ca656bf17d74776e74d6aa56b6eab4..02dbdb42b489b11654ba2b03cbea6a1d2b0ce7e1 100644
GIT binary patch
delta 17
Zcmeyz@sES!)W2Q(7#J9gHgc4)002ls2D$(M

delta 17
Zcmeyz@sES!)W2Q(7#J8#Hgc4)002l$2D|_O

diff --git a/bin/view/SDStockCardWindow$3.class b/bin/view/SDStockCardWindow$3.class
index 2921fb3f3d4cfb6e2fa6e5c3ba7b0374f6e81103..e2d8af2033ed9e7a419bab35a1e9ef03f5715fb7 100644
GIT binary patch
delta 17
ZcmaFJ`jD05)W2Q(7#J9gHgeo#0sut~2HOAt

delta 17
ZcmaFJ`jD05)W2Q(7#J8#Hgeo#0suu92HgMv

diff --git a/bin/view/SDStockCardWindow.class b/bin/view/SDStockCardWindow.class
index 43b9ea31434cff0cb26ff8378f36f0c40c551001..c2b2d143ba1bbddbd17c9a88a9959bf359c234c5 100644
GIT binary patch
delta 29
lcmbO(HeF2M)W2Q(7#J9g7*??}FflTSO;%(S+o<-D3jm5$2t)t?

delta 29
lcmbO(HeF2M)W2Q(7#J8#7*??}FflTSO;%(S+o<-D3jm6D2u1(^

diff --git a/bin/view/TileButton.class b/bin/view/TileButton.class
index 2c088ecaf781e31ddf8d792328c7fe983e8cdd13..7b840b9139b5fa57a9c0ded00d7a86535dd5f1e9 100644
GIT binary patch
delta 17
ZcmdnOxrLMC)W2Q(7#J9gHgc?C0RTUZ23`OF

delta 17
ZcmdnOxrLMC)W2Q(7#J8#Hgc?C0RTUj24DaH

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/view/DealCardWindow.java b/src/view/DealCardWindow.java
index e4f9b87..0dcf33d 100644
--- a/src/view/DealCardWindow.java
+++ b/src/view/DealCardWindow.java
@@ -88,8 +88,8 @@ public class DealCardWindow {
 		JButton BigDeal = new JButton("BigDeal");        
 		JButton SmallDeal = new JButton("SmallDeal");
 		SmallDeal.setHorizontalTextPosition(SwingConstants.LEFT);   
-		JButton AcceptDeal = new JButton("Accept Deal");        
-		JButton DeclineDeal = new JButton("Decline Deal");
+		final JButton AcceptDeal = new JButton("Accept Deal");        
+		final JButton DeclineDeal = new JButton("Decline Deal");
 		DeclineDeal.setHorizontalTextPosition(SwingConstants.LEFT);
 
 		BigDeal.addActionListener(new ActionListener() {
@@ -143,5 +143,5 @@ public class DealCardWindow {
 		controlPanel.add(SmallDeal);       
 		mainFrame.setVisible(true);  
 		return response;
-	}
+	}   
 }
diff --git a/src/view/FSWindow.java b/src/view/FSWindow.java
index 9585627..fb49517 100644
--- a/src/view/FSWindow.java
+++ b/src/view/FSWindow.java
@@ -23,9 +23,9 @@ public class FSWindow {
 		FSWindow.prepareGUI();
 		FSWindow.showButtonDemo();
 	}
-	private void prepareGUI(Player p)
+	private void prepareGUI()
 	{
-		FinancialStatement currentFS = p.getFinancialStatement();
+//		FinancialStatement currentFS = p.getFinancialStatement();
 		
 		JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
 		splitPane.setOneTouchExpandable(true);
@@ -95,7 +95,7 @@ public class FSWindow {
 		String[] incomeColumns = {"Description", "CashFlow"};
 		Object[][] income = {
 				{"Description", "CashFlow"},
-				{"Salary","" currentFS.getSalary()},
+				//{"Salary","" currentFS.getSalary()},
 				{"Interest/dividends", ""/**call interest of user*/},
 				{"Real Estate/Business",""/**business of user*/},
 				{"Real Estate/Business",""/**business of user*/},

From c0dbb74eef6c2dc236a76895a8b88a4bad685599 Mon Sep 17 00:00:00 2001
From: jackie <jackie@137.99.182.176>
Date: Fri, 21 Apr 2017 19:31:11 -0400
Subject: [PATCH 02/10] trying to pull

---
 bin/.gitignore            |   6 ------
 bin/model/CardStack.class | Bin 1828 -> 1828 bytes
 bin/model/Handler.class   | Bin 741 -> 0 bytes
 bin/view/TileButton.class | Bin 1204 -> 820 bytes
 src/model/Handler.java    |  25 -------------------------
 src/view/TileButton.java  |  17 -----------------
 6 files changed, 48 deletions(-)
 delete mode 100644 bin/model/Handler.class
 delete mode 100644 src/model/Handler.java

diff --git a/bin/.gitignore b/bin/.gitignore
index 4a6964c..66905d0 100644
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -1,10 +1,4 @@
-<<<<<<< HEAD
-/view/
-/controller/
-/model/
-=======
 /.DS_Store
 /controller/
 /model/
 /view/
->>>>>>> branch 'master' of https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git
diff --git a/bin/model/CardStack.class b/bin/model/CardStack.class
index d9e4bf91d77e8940b9adac3ddc072f4a7d4d563c..158a0abd37987cf05ebabaeda4e8f892d442f058 100644
GIT binary patch
delta 19
bcmZ3&w}fxQYPQMu*i0s`U^AX9#4ZE?Olk(B

delta 19
bcmZ3&w}fxQYPQLb*bFAGU^AaA#4ZE?Ooj%h

diff --git a/bin/model/Handler.class b/bin/model/Handler.class
deleted file mode 100644
index 168fca9f0006f3bd9506aa83659ccce633696c44..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 741
zcmaJ<+fLg+5IvJP2?U3Pa4Qf>3k8Cu;urcvh16EPM6yaHP~JDrLKitUS`7R{|E3R7
zB_8?#{V3F#by`}fsw``6XJ^iw-5>XN-vJz8w}uj-G0KKI2|uWGm}pyrM`&HB8x<xh
zJr9ou7dp;ss1nv)R^8^IzR_tOzKU~`rIESHb*e4Fvz#SRk5IX^Cf0;zlEq3;$LZ@#
z*&%~+lW@V0im9g@9TKW9O=|KZ!dAD}`?K^bc&|p<bvWGXbCWkrxsEdCd^FG|l)HQV
zX%H5COk+yCB_FlId*ovVzT{SY)G@`ZB9rQm*Q0^9r)nT{+7a_i`pO!KCrK~=Y_0_T
zmq5(6GAMSLn^YdiF<LoQK52WF*^%arH@eY3g?lR^x^*f}PeSK^KtlZ_ySA}@R|q({
zuYKu_r@UR6{|Y>mWO2UVl1Sk!FYPSL;4I%cW*Ob&=nLbjY*&MCXa#Fy%m<w@7K7(w
zEC-9;7%N}hnKi*U<P6VfaPL|EnwUomD`=y`^`oK_*72Al!3zU&o^UETPgs<lC%io8
pZQu!WC*EUo!s`X+1y2v-tFG0u8?{sve~;pqgJ)bPY`cRyKLJZ!j3WR5

diff --git a/bin/view/TileButton.class b/bin/view/TileButton.class
index 2c088ecaf781e31ddf8d792328c7fe983e8cdd13..56055d01c712aab61a54f145344334a33cbed63b 100644
GIT binary patch
delta 354
zcmYLD%}&B#5S(ohWBruMPX&RBC<;ZaCVEl4crhm2Ot{z3keX5=5UxH$^F4_P*2IGk
z;1l>X#%(d0FPU$5XJ=*?Ym2n@`ThO@;2dY6HV<X@S{D%5A{3gvM`!NXz7q`X``N?`
zhF7h=h8zm3$P+T7@xb-%TW93njGf6qz`(W?RMSfW8rC%s$^sQsWtZx?U4a^^1a0ch
z`rg!g@LkzZ0)_5msF?CgaY&JuYWbNseuK4}eAN?Fr1&pc?KfnsP9;M26-7&puw$hn
zm@iB!*kd%X!l*N5S(@iF4HWs+d1@_9u#W@o*bWUGaztDmp~(($)#5!BJwhADzxfwT
b#3cRaq!XQ)_!>*{&zI1_3G)Oy5uW}4mhvwh

literal 1204
zcmZuwYflqV5IvW+RLWv`KP$>ZX&1|?peRL@hd@cAAHW*@wzM~J&9WuCTkvOTqBYUP
z#IOD+<GH&lAkyT%c4p3;nK}LS``Zry3)oJhO(1)s<f*l%9J$sEf`*$$QlRg>ePVyG
z{8Qx~SUZtHpxc+8vYo2*eARGYmp25&jzHIX!}SB(4XU=&lqq8CpAbj}L=`Y9M~%94
z!W<=j^`sjxvMi7~_Ee1??aRtl!HU34zM?Z*j?KKgfyeZvavZ*8AIY_b?bS<#DpA&n
znLz@52D0cE7`P&|P|aWv!)Xk$&WOYrih&V~3ZxHYpo^zNzFfG-v;zV;0~vH?cpEox
z6SoBVeHpOcfHkao(%w{#BkQD-f2WfPOd6QNG;!%yb^~7^k&i5Q49sYR3@ugVt9?hN
zQDFNbV%xS`cciDY&KkImE`2K+Fwm7j9+ocip1@ST{I?;R_LbeyJRTUB$AUnQU9Yd!
z0?w<Ve6p4vImWHBPXkMyuoCNEkFdenigM-4=Fz_N_H1$$=&dwroW4yB@Ew0l28W78
z_Eav(NDtcO#B|tyBNgb><X^erJgI|yJy(r#X-FF7kd5JVVpH6vQW~pl<+-r5m~5qm
zHF%-AEzdqaR5d@WNE}eu5gA?inT<HRjiy(V9H!QRrWQ$lPBX^@+nJ!ElNdz`?R=&A
zYQr@ysw2E}O5w@5@l4Psi*D{ce0`+9{#PuSvtQ9`7IQ5Oe8HHRXyJz0!i1S@;r4gr
z-<qFca^2+`%N4(3ZYgPw(0Kn-i2abe$&4Us3Vqbb0QX@GQOP-SD`E_DJm>j(f^j^e
z=R%Yji+IczInc61Uiwxd*S7GsjHl#0Po67y#yTl8OvmgOd20U-&FUwfzd0w93BxDZ
rh}kfi5jn=m1lF(~gJ|kHl{gR9eFUs9a4<5Su@u<A3)%%X!@#XSA^`WP

diff --git a/src/model/Handler.java b/src/model/Handler.java
deleted file mode 100644
index 8515231..0000000
--- a/src/model/Handler.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package model;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-
-public class Handler implements ActionListener {
-	private int rent, price, locationOnBoard;
-	private Tile tile;
-
-	public Handler(int price, int rent, Tile tile, int locationOnBoard,
-			GameBoard board) {
-		this.price = price;
-		this.rent = rent;
-		this.tile = tile;
-		this.locationOnBoard = locationOnBoard;
-
-	}
-
-	public void actionPerformed(ActionEvent event) {
-		// refer to getLandedOn? Or one of the decision/card windows? How do i do this i am tired 
-
-	}
-
-}
diff --git a/src/view/TileButton.java b/src/view/TileButton.java
index c3c06c8..3aafc82 100644
--- a/src/view/TileButton.java
+++ b/src/view/TileButton.java
@@ -11,7 +11,6 @@ public class TileButton extends JButton {
 
 	private static final long serialVersionUID = 1L;
 	private Tile tile;
-	private int rent, price;
 
 	public TileButton(String name, int TileOnBoard, GameBoard board) {
 		super(name);
@@ -20,27 +19,11 @@ public class TileButton extends JButton {
 		// this.setOpaque(false);
 		this.setContentAreaFilled(false);
 		// this.setBorderPainted(false);
-
-		this.setInts();
 		this.setVisible(true);
-		Handler hand = new Handler(price, rent, tile, TileOnBoard,
-				board);
-		this.addActionListener(hand);
 
 	}
 
-	public void setInts() {
- 
-		if (this.tile instanceof Tile) {
-			/*
-			 * i dont actually really like this method 
-			 * but i think it should be like that iterator in cash flow
-			 * that determines moving over the tiles and if it's landed on
-			 * the gui should be brought up already in the handler method
-			 */
-		}
 
-	}
 
 	public void paint(Graphics g) { // Do nothing here }
 

From b836edd0a6c4d626a4d7a35f1348ce134eb5f7d1 Mon Sep 17 00:00:00 2001
From: Annamarie M Fortuna <annamarie.fortuna@uconn.edu>
Date: Fri, 21 Apr 2017 20:04:01 -0400
Subject: [PATCH 03/10] Create MainMenu.java

---
 src/view/MainMenu.java | 103 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 103 insertions(+)
 create mode 100644 src/view/MainMenu.java

diff --git a/src/view/MainMenu.java b/src/view/MainMenu.java
new file mode 100644
index 0000000..6b52d2f
--- /dev/null
+++ b/src/view/MainMenu.java
@@ -0,0 +1,103 @@
+package view;
+
+import javax.imageio.ImageIO;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+
+public class MainMenu 
+{
+	public static void main (String[] args)
+	{
+	JFrame frame = new JFrame("CashFlow");
+
+	frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+	frame.setSize(650,530);
+	Dimension dimension = Toolkit.getDefaultToolkit().getScreenSize();
+	int x = (int) ((dimension.getWidth() - frame.getWidth()) / 2);
+	int y = (int) ((dimension.getHeight() - frame.getHeight()) / 2) -100; 
+	frame.setLocation(x, y);
+	
+	JPanel panel1 = new JPanel();
+	panel1.setSize(140, 45);
+	panel1.setLocation(255, 125);
+	panel1.setOpaque(false);
+	//Font font = new Font ("Times New Roman", Font.BOLD, 30);
+	//panel1.setFont(font);
+	
+	JPanel panel2 = new JPanel();
+	panel2.setSize(140, 45);
+	panel2.setLocation(255, 160);
+	panel2.setOpaque(false);
+	
+	JPanel panel3 = new JPanel();
+	panel3.setSize(140, 45);
+	panel3.setLocation(255, 260);
+	panel3.setOpaque(false);
+	
+	JPanel panel4 = new JPanel();
+	panel4.setSize(140, 45);
+	panel4.setLocation(255, 295);
+	panel4.setOpaque(false);
+	
+	JPanel panel5 = new JPanel();
+	panel5.setSize(140, 45);
+	panel5.setLocation(255, 330);
+	panel5.setOpaque(false);
+	
+	
+	JButton newGame = new JButton("New Game");
+	JButton savedGame = new JButton("Saved Game");
+	JButton rules = new JButton("Rules");
+	JButton settings = new JButton("Settings");
+	JButton exit = new JButton("Exit");
+
+	newGame.setPreferredSize(new Dimension(140,40));
+	newGame.setForeground(Color.MAGENTA);
+	
+	savedGame.setPreferredSize(new Dimension(130,40));
+	savedGame.setForeground(Color.MAGENTA);
+	
+	
+	rules.setPreferredSize(new Dimension(80,40));
+	rules.setForeground(Color.MAGENTA);
+	
+	
+	settings.setPreferredSize(new Dimension(120,40));
+	settings.setForeground(Color.MAGENTA);
+	
+	
+	exit.setPreferredSize(new Dimension(100,40));
+	exit.setForeground(Color.MAGENTA);
+
+	
+	BufferedImage img = null;
+	try {
+	    img = ImageIO.read(new File("gameboard.png"));
+	} catch (IOException e) {
+	    e.printStackTrace();
+	}
+	Image dimg = img.getScaledInstance(800, 508, Image.SCALE_SMOOTH);
+	ImageIcon imageIcon = new ImageIcon(dimg);
+	frame.setContentPane(new JLabel(imageIcon));
+	frame.getContentPane().add(new JLabel(imageIcon));
+	
+	
+	panel1.add(newGame);
+	panel2.add(savedGame);
+	panel3.add(rules);
+	panel4.add(settings);
+	panel5.add(exit);
+	
+	frame.add(panel1);
+	frame.add(panel2);
+	frame.add(panel3);
+	frame.add(panel4);
+	frame.add(panel5);
+	frame.setVisible(true);
+	
+	}
+}

From e02e5b0e1cee29ee489cc287950c46b9af47836f Mon Sep 17 00:00:00 2001
From: jackie <jackie@137.99.182.176>
Date: Fri, 21 Apr 2017 20:18:58 -0400
Subject: [PATCH 04/10] ahhhhhhhhhhhh

---
 bin/controller/Cashflow.class  | Bin 2286 -> 2351 bytes
 bin/view/GameboardWindow.class | Bin 5533 -> 5224 bytes
 src/controller/Cashflow.java   |  10 ++++++++--
 src/model/Player.java          |   2 +-
 src/view/GameboardWindow.java  |  25 +++++++++++++------------
 5 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class
index e57c612d6a538afdf0ea50ce975543e4715354f6..0dfa4b16cb965ed07505224298ad26b826feb80f 100644
GIT binary patch
literal 2351
zcmZ`)T~`xV6x}y7VUjo~Ai=7j*xDK*7^F%qK~V6cXaZ;yO3})YjLBe<iOB@2{j_zh
zzO=9H^3f+>eCfvuuCi)<ZeRLC`V+dO`%WSWLf3-1UuU1Q&pzkg{Q2^?=KxON8x0<T
z-AOy|6zy!*EJntSQs#EnUeTZmv@99RMkH(G(~+sgB{S&=G~HUXjbcimHI}neW;Sxs
z$eCkuD=MHBvc^5LSQ6MZUpt<5cX;Mc)3Ao^h%H;@iVJmjX03e6UZGJSU(Qt#^dTk~
zZrI9O&WL~#>X{Kx#~CvK1+6-ov6FFPR^FT}=N8T4HDfVr3be)Sq>-I5ik4j0HdQBM
z(PJ>SO{NU1<_s$@&=H!C)iX{wMJu0<_RItzuvf=E8Bcf2k|R@=ED1D<Y5Lv04Nkz5
zwrL?Hksi8r9KxFdKC8rZ^JdY_=_7&WgkvP{#EpW>)lbv6b!hMfa0ERXLJV3}x+;v0
zuyoUuF-o&GNej9V1%aKL1+O`1)o`3Dy;iCK`thz*@C5Z@(vAL^upfgsrQy9z4Uo83
za?G5L_c27~cA32ptg2<%k!echP%zWTMJ4ZH9jC#n?MR!BtcPPss;uEe0B10!;VeaS
zrQQtIF^+SxkEFjWA!=ws7N8#&bX>#-?2w$j?20c1Yzu9sKGDOL@f4V`r!YWS(ri0f
zuyM9$Ny8)&)l|o<^f}YWy2=L-N2~l?(Q#Fh)<`;G-8VH{6WH^5LyVQJY|1PKFoO>@
z%x>1mZ5bVNU{SPXBU?77Zc`^Fv9+-RNZ^Jn!cA$h^}J`shg-~Ks9RbZIu?;+-Hk%Q
z%=7;BZ3o%nrN)*;iNn-!8<a$0ep^UY?{`##<!UT%wp1;E4DRU2BFD}p?waMuOV%Fx
zpM-231=rTGtM^CNyC}<gQ&Mnrl(9?-1zWZ(y;SQVLq&b~gty^Rx#V>7xL~G+x|x2C
z_p7~T)>t-P+a2<4uvkVGi`6D`h3^M3Np^tV=vwZvAp!}zTuho5ESW>|tEcXmEHN)9
z;d~TTc;H17XDlIn?&wE=qaQn<bJTdk$A{ltTtzqvj^6MpT7KfhgEoGf+)Y1rbFNnn
z(2gKieso|DcO-a#{}QY|!y9#MfIfh|q_e*PuX5Gt+IMXPKU%|!I=C9Rw*g4~+`s|{
zHh`lHD+Bw&6&!rD{;$L<F7aycer9>P!H2Kr<1N>YNFiS{eq|OvlCKmjtPF>L#o@Uj
z@AE-b8F_;Cz22^Ycy9&oJc3t!`cM&FLG|(aKl`6<gxlvL&(gyfbvcJFT);ujLzr;G
zce_Oi*TQ?ae+Wkzw}U$NqK`O9DF|g9t!QFtn3vFS3~2VSYJ9Y7B!6HaS>H2jI5M}2
z$mQA?TSNbx_jhh8;l!MJG_i_-_|G^=VWJg`_J(~GoS&_4)RjI!jetq^$P`*Ijl;OY
zxL0wK*L4)vH|YCtipliRwuKMbCC&tGJ8_weJWM0@ilg|B-6w^7v4%J~PF*I6>0#yc
z6CCeU7e+{84T-s~XSlwK`L>TMSO|Akka~ek1xs92kgwqGLyzd(|9Jgxf=hAvnXCcZ
zRtRG?>ZXkceT@gop!x(SgQ~hP=&czAy^V2$>NbH@5mXuZuX;C)xD7H-jc&-7jvaQ3
zrCVTc-Nbn$sYZ(GrTNNa@BmBrmQT(1$bnq&2kyEWUM1RxXSj#^)TSA~;8XWX?c&eW
zXPkNH@d!TWOrgJJe1R{yH%0VUoGEySsB5RvbB}B1b(`h@)R$<}5Er6voo(lpQw<sZ
PvB8hCN)H&%gRlPs!42hU

literal 2286
zcmZ`(T~`xV6x}y7$%JuI6^T{_#cDM~FhUhALA2mkB#1Q%jn<DL8N%o!lO_|a_IoYY
z>P!3DE+2jJ#g~4p;3})u=k}#Pq(7lcy6+^KAaoIC?%aF!Is5E$?)mfOZ_fc7!PgoB
z0$Xx!$*Z`IV^tCpW_4lSaqnqR1vcF=7tMrYmI{gKxjR<Q6A0a!bInR#U~{_Y<}D|2
z&MaEvaw{nizEyV2`&OkYu<?5H{F1-J!_cT*vb`|@CDu11piU63LqWtq2XrFRcFDR}
zE6!P!E9RVI33R62oaxM%6<dBcH&t)JrvGSq9ny@V7EQY(ur+o)-6EgyDt4)m?3>X+
zq=Bt6p5a+lPqLQ`2{bDO`rWb)P9RWlX(5x79=Z+mU>DQ1tFv~gWL5l}t_egko|(Hl
zWtM%e9W>ozKtou^Uc9SeAA>eTYlvcCzjPB?FsrjJNej9VWr4R=OV@M|(J(-j-cVgf
zKN3>G!_<pOxBF+p9T>t94ezb0W#)d>vx)|eVwlX`8p|4OsAao}OO(o^V3t`-O5Vo}
zypIuq4F$`S_3&&-l{HN17{!=|6BNytdNtU<Nt_bU%F>@hh#E`D0`z0tzywYU=tXzY
z7hek48Cy*~)t92|<w5xvqAUf04q31Xc3M@#1tJ=$j@yOPmg)G)>qsFYA5#V{O41rh
zXY2=-hD!q5-fW2Rn(gGRijK>;q9L<dBfn(~Tm^eoTQr@TH9b$An8ez~(lL#XWD&B`
zV(od~Oc>Xh$w;rXykX!bZn5rWxonkql?K*>tnt!h%c7)U8kj?lWng}5NHwl%QUk9L
zHI|oDs-`24f`J9t>|Elm*q*#(U9ta3=&k|BxAok{{gL%9$+Bi8g|dN9AUnV8%9f><
zR;Xkcq!qbPt9rdWE?fDLUZ!8<{pxC(wU>?8c7vP^Hp|FjvD&P?AWfxID-xGu7Z~mC
z<sO?t&$zWp&N^$$JR+|q*CAPE?BV58IO78R3nJvNc#-(lc*23h=LUWy_!fKz<4Z7p
z^3C4jGvsfEu#sz{VSr88%&!h~VheX9c!>WJtUg0m3#&6EXrmz7hF7r-Z~OM!Uk5+f
z#ETZV5qN(akZtJ)7TEC`c#>gd;BdT-osU-jm3Re`cq4e6SsrWi5pMd}?b{J4<OJhW
zX7MBWN`d0aX#7|7W=De0hgD_l3A(lidxoa^>v-o8g6h+Uis*@|k5~TL`P6qK!|m{q
zNqQLNR2`$&Q`pUQj8|N0*XtJ{-V7h$eh&^X?pEp;LmzRHQWVMxa}2RG%u8s91Cao8
z;h=7k{DFaFJx?uTZ*~a>C!6o|GWxT@-?^#8Gg<XuW(kL;e#Rh$IaWuqKOU~*gW1+b
zOX*$I2sqE4NRi$J?877uA<d~c#U7u2O+Sp|I76zS)nT0FO3=0&=g26)G|s=`D87U0
z%kg3vDRP{gB#HE>a^eXFyVcucB(aR?Y|k@%xP;lxYju1a@2=za3*_sV=T{wf>L@-8
zi0++_SN<m0osy4>O<-r0Fjk{w+I}$5exMAiPjED<s<(%OO`~YAJ#JK8C$K7_DkJ~Z
z>ZUPYg{#zP1`*7%^|P$WHJsr33~o@hn^el=P?^IwoG;&E9^a#YI@f>Tu8+P<bQsT2
z!y+||;1}G(r_^vGhH;;(06iYS1FjVMTf}GhoO{!pE?;n^;31N}ol4JrzFp97nq5#|
dqEkakh=CQ>B`B8~^8B&E2N~f@#tY!9{{VrA(+L0o

diff --git a/bin/view/GameboardWindow.class b/bin/view/GameboardWindow.class
index 06f8a0b2c92dd6de15bb927885ac76e1feae25f9..dceacd12a6d57048d49b97a3aa2e1efec6c1da81 100644
GIT binary patch
delta 689
zcmZ{iT};h!7{@=qmqVShUQ}Dd_MgTKTcU-?h=eq0sukj2{ZXCHznzXlrjGYA%1e{H
zG%+zZ)DEl3w6WQ8W!8m++T74wm@7A$|FYR!xOtxM_jx|g#k1$>T=Zpu`}O40=Rhjs
zz3zdq;B?*#qN>b*nd~vW`;)VLKHC?@2Z6u9>$B=?Pr#}$%I%ukN{{KUw7o{H&o1*=
zHFfERJ3P;0)>}TK-1K^Fzfooxe<%F5VHyF`S7|!%|H1eQ<6qLv2v%q~JV(StGlLj3
z(ZoA>7IC2^5y{hnDMYc<DJ^5JvqdUttY<l!SwRsisbUrNtR_eXEv%u7we+x#J~Dab
zkRxRAm5qESTfinUlPw~N9I=qCBAr~3%QjI;p0L<1{N#&fc8F^fh%O4nBZ|b!AjM*s
z5;4k7F~Ke|NvVutk4#{%oR2BfDVI4^$b2kW#y%O~fNY{two)ZKsg}Le$QO9!5Vm|r
zt^9^h{-RE4{3@1%Y95DF8i!Q|^(u!Ws+6P3ra=X0RHq55U<b$515T(OPO3ppskfX_
zpJ`GPG^?MS)e)T2vpKJmXwfOO>MSnmLN4juT-MdJ=|-;T3$*KYuIg?&bU)Yi5I6K2
zZt5{Q^$%{j6kRSiw_S<caV_SqD}!#=2JX4?xvyOo4@2XzmWb~ql8|$n$IRgg$&SvT
zzpW%LGdmGM!qk^3M}d2Qk>c3VK0XdQPSW7SX;YnNG&(x+59M6#nBxSWoG2Ol4MGd5
AWB>pF

delta 991
zcma))TWnNS6o$WjIRfJt(voQuizX7ywABn?DW+vmplE7GsZhrPp?X?Q>Xfk~)6>dC
z>7almDn-1YsA!3z@j-1Z4h9SuNk}kJF7ZJqP%es4K@nd}RAAM{gv1vg&i?=Pt+n@A
zJA0iDZ!8IXeR10kpp@Tx1KUSh#kJvedqdfxxZ<{Otl4dMBW->n8JV6=yO~&`)t@>H
zlWt2>q^iaDn!I$yw2Gqm2o5Xq{@HM4E<is=gADMkVq~JlkGsh>FTm{_5AqEs6ee6$
zITZg8WIrbY_?!xo{fW~G+v@psBH^l{_)uan$j|@sdBT&a#u|lMDqluX5KA?>$+(+N
zxD83KHuJbwJ7g5a|Nk0_z}!?@y0On4HB;r~aSi!c@(77uPpI#+K;)|I1V%Ga&?Ih>
zzDt?ROv<QY3J-Ay&6Ja&f-F;6LzHgrq=&oM%5-)!gM(CZhFP5FZUy(KF;uDX+^dSI
zR^`OhecZ3=nXNo(l+OcdHFMPlYE?H6s!xckU0LeXcg$1$%vXafP#0OKM^mp0cv#=U
zBf6XhT}`8&!y?^)r`u`Lojj_$Na&3;>t2%jD<0E(Xwl!3(q~zs|0ZoLttKDe+)TSE
z;|UXGsi`Jo>Uq+nc*?Z1%&elrWM5~w`H-hg56_sLtS|>yWlr*}8Kl$v!D@Ro&)Gtr
zx8r%iPGpUp#abKZMZ1u7b}=v64qmZqdDX6Gz1_@f_H#DaJ-lJ}@unT%Eqj5t9m6|L
zfNtkHHaWNQt`p@wr;^Ri9NxE%$47l$zNbPx1o>2+r;l-LAtFA?)|Usy%*Y-@%abAN
zAqqrKVQ@qjnCJ)86mMa2NnwuNU(%oB$fO*{x~BaXp6n{KLhFYs{c$;dydn(Q9A{Q)
zRalbaz@|$d_sa2>WwPEtc7(__`QvuR@&yyvAycrE*}~?tiw?<_4)-H-vRoqRjI(kR
xB^}qXf|a6UWwOqRGqV3iei3K+RVss0HC%sQT&MU^=)Z8(pTq?GCctPeTn69t`b_`;

diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java
index fde4514..6ef1cc0 100644
--- a/src/controller/Cashflow.java
+++ b/src/controller/Cashflow.java
@@ -1,6 +1,9 @@
 package controller;
 
 import view.*;
+
+import java.util.ArrayList;
+
 import model.*;
 
 public class Cashflow
@@ -8,8 +11,11 @@ public class Cashflow
 
 	
 	private GameBoard _board;
-	private Player[] _players;
+	public Player[] players;
 	//private CardStack[] _cards;
+	public GameboardWindow gameboard;
+	public static int numPlayers;
+	
 	
 	public static void main(String[] args)
 	{
@@ -57,7 +63,7 @@ public class Cashflow
 	public boolean isWinner()
 	{
 		boolean isWinner = false;
-		for(Player p : _players)
+		for(Player p : players)
 		{
 			if(p.hasWon())
 			{
diff --git a/src/model/Player.java b/src/model/Player.java
index 5d2fbcb..5afc969 100644
--- a/src/model/Player.java
+++ b/src/model/Player.java
@@ -6,7 +6,7 @@ public class Player
 	private boolean _donate;
 	private int _charityCount; //charity counter
 	private int _downsizeCount; //down size counter
-	private int _location;
+	private int _location;//refers to a tile number
 	private boolean _hasWon;
 	
 	public Player()
diff --git a/src/view/GameboardWindow.java b/src/view/GameboardWindow.java
index 29b0969..d6d8c45 100644
--- a/src/view/GameboardWindow.java
+++ b/src/view/GameboardWindow.java
@@ -1,27 +1,27 @@
 package view;
 import model.*;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Image;
-
-import java.awt.Point;
-import java.awt.geom.Path2D;
+import controller.*;
+import java.awt.*;
 import java.util.ArrayList;
 
 import javax.swing.ImageIcon;
 import javax.swing.JPanel;
 
+import controller.Cashflow;
+
 public class GameboardWindow extends JPanel {
+	
 
 	private static final long serialVersionUID = 1L;
 	private Image img = new ImageIcon(this.getClass().getResource(
 			"gameboard.png")).getImage();
 	
-	private GameBoard board; //
+	private GameBoard board; 
 	private Point[] points = new Point[24];
 
 	private ArrayList<Positioner> Positioners;
 
+
 	public GameboardWindow(GameBoard board) {
 		this.board = board;
 		Dimension size = new Dimension(img.getWidth(null), img.getHeight(null));
@@ -45,6 +45,7 @@ public class GameboardWindow extends JPanel {
 	public void setUpTiles() {
 // implement the tiles into the graphical boardspace
 // the buttons are going to be a little off as i couldnt figure out how to rotate jbuttons
+// i guess it doesnt really matter what tile is which but the position matters - 0 is starting
 		TileButton t1 = new TileButton("Deal", 0, board);
 		this.add(t1);
 		t1.setBounds(125,532,95,20); //xstart,ystart,width,height
@@ -182,11 +183,10 @@ public class GameboardWindow extends JPanel {
 
 	}
 
-	public void update(ArrayList<Integer> locP) {
-		for (int i = 0; i < locP.size(); i++) {
-			int x = (int) points[locP.get(i)].getX();
-			int y = (int) points[locP.get(i)].getY();
-
+	public void update() { //updates the location of the player on the board
+		for (int i = 0; i < Cashflow.numPlayers; i++) {
+			int x = (int) points[Player[i].getLocation()].getX(); // i will fix this later
+			int y = (int) points[Player[i].getLocation()].getY(); // hopefully lol
 			Positioners.get(i).setX(x);
 			Positioners.get(i).setY(y);
 
@@ -197,4 +197,5 @@ public class GameboardWindow extends JPanel {
 
 
 
+
 }

From 162cbc34c6e24c393e42804f8543ac11636ebd55 Mon Sep 17 00:00:00 2001
From: afortuna2016 <afortuna2016@50.28.173.85>
Date: Fri, 21 Apr 2017 20:52:58 -0400
Subject: [PATCH 05/10] main menu

---
 bin/.gitignore                |   7 ++++++
 bin/controller/Cashflow.class | Bin 2286 -> 2169 bytes
 bin/model/CardStack.class     | Bin 1828 -> 1828 bytes
 bin/model/Handler.class       | Bin 741 -> 0 bytes
 bin/view/TileButton.class     | Bin 1204 -> 820 bytes
 src/controller/Cashflow.java  |  11 ++--------
 src/model/Handler.java        |  25 ---------------------
 src/model/Instructions.java   |  10 +++++++++
 src/view/MainMenu.java        |  40 ++++++++++++++++++++++++++++++----
 src/view/TileButton.java      |  17 ---------------
 10 files changed, 55 insertions(+), 55 deletions(-)
 delete mode 100644 bin/model/Handler.class
 delete mode 100644 src/model/Handler.java
 create mode 100644 src/model/Instructions.java

diff --git a/bin/.gitignore b/bin/.gitignore
index 1f65b37..2255885 100644
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -1 +1,8 @@
+<<<<<<< HEAD
+=======
+/.DS_Store
+/controller/
+/model/
+>>>>>>> branch 'master' of https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git
 /view/
+/Instructions.class
diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class
index 1704d346dd38edd872674781d7eae2aca87eeb88..88b07e4430aa323852bbc1736f5d0420a50c6cf9 100644
GIT binary patch
literal 2169
zcmZ`(T~`xV6x}y7$s}=7H4?1~N~^6QiV+H^fT-XX8a`?)6s^Tc7{h3iNs|dy+n288
zT779>+vTHAzWCCQ6<lT2`rN+shx8|ON%xsV0i}G*+`0Fhv-jQm-23Ot-<|{L#n%P`
z3On*{*{iz6qFqgoS+&L6MfaWoU18fDYspF%t#TnfmAhl-J%!MG&b6uw3fnU!cfl^E
zFIpvgRHlX$!t<4)b>FVm6t>=Itxx+iTnr66Wyc#)(2`v<3i=q+qtFmD5kZt08K-Pd
z)=N3Ndd<oeZH0Ko&0ED8tLn&iYf|?X9oA1|HX%)vK*5cm4Lc1aHt^5huX%RK#4fx`
z25y~ONo4%(Ic|Eo>Xf~#SGBFuP#Aj@qFK+XdYuLCEsA#RGtfbqHVHSeADs$DMJg1_
zEShXq^+jVzr(78Fw=2p-p>V*&L3}{1oZ75YF56XKkn0LDV&?BoSQUSx5r!sB7zjs^
z!Vv?970jmMO+`&~OPSE3RhxAQtXM)-6yDjWI}0$;vumChC8<&`W}u&nzu{mMeK;;|
zoS^o}Hw^5Wk;Fk0Ll{=rQm{R7$8!Xmj*g2?BO=FXdYc@V@IIV1F^VzjS#p<raM^A=
zxsl>{*EoHv^vI)^n<ywmgzy-fs%C(T@g~txr*O`;ioQ-!TtZA9850x2$RMMv^T0MR
zrLb$Qaho2D)}7*lU5(;nWDQ*1*c!e|Ca&QVmRYijb$jZzI62<+wwF;%VpcTj3}cRr
z2RmivhKbK`lWtg*ie2XE=-#Xi-m2DOH6;6(H*pIVwd6kD0&kwaAp?0|OF4I<P82!V
zCT@e0g_(EF@#NgJCI5%GW8#h<>$y!?1h{CT1TnGVO8YRkskQ*{G;l6<xnA=+xm>Xq
z2HEX_5)WWoD{Q?fJbzo{kUKPqR?thDrySNU*GtUH(_?ded6}c-(X3mq=IslPu#dgE
zf{u!bc#j7`<7E}#ZxA7W#HQvu#1-Bgd~V@ans3E-FtrTxCqL|+R*-~l<=AWnU>mmc
zD}wmz<Zc$1pUBVH5#Qaw-n9Zze`z}r_xnX8P?6Ou+|w=GaH@g#AFci?nHmJTnR$R`
z_}Du5a0~uJKaPx*+y{KhCVnKCY%!$`r+&quxxwJ`0bLt;g0|hkj^2qQ4Rk$1P=ESR
zQymHY@#;T&pZaA4ZjYbY#|r(}iR0+NNmA}d62m@xr!Qlw1s~x2K^!ISPAZWm#Q=m-
z0@^C&2^mn-QyJ(1Vgc@@_w|l{Adon6W(BFaWqfp{_0FuIZ!Y*dC$&^|PCuMo#=ryx
zr7$NOICUfyZs5%9+Qgd1`=}9cmKu+e-WZ9UBenA+e*vf2qGF!V590(^j`3?7pXd26
z;<Ym>MEVh2e8o|H2i=$B#R@Kw<K-(Pab;LL^#ncb`mGU?Si$66$1_YXV<!G-1J_gS
z4SfCrxds;a)xaXV;9)?u?|r=bH<Ry9$YZjV7<ZXQH`YSeFLbY8&<6A;=uhbSt$|=G
zC=pzbo6t7_)>T3$@?UG+G~%l;Ne!kD!!(=sDy_@n6vyW=gUguZ%5^N_2EM^fe2aN}
z&nu<D@gG?5v#&BcjA!@)RcaW+FQ~zzhFdX!I!6IkJcK2VG}c?fJ$%WzDaPODNW(*3
q{t~CNa+e<$^qXcM^p}VmxTI9~D%}Xm&_IrVZ15f;JRn{GU;PJTLcd=C

literal 2286
zcmZ`(TUQfT6#h<Tk_qF)3lgmgiq&d}V1!n*1kr-GNDylj8m*Th8N%o!lO_|a_P&;D
z^`(7nmybUA;!7_pxXP;axqaym=}+jAerFO*5V{C6XU^H*-rxTAKKsv?zdZ*qgs(LO
z1h(efl2>sZ$EqYI%<96t<KEMt3T(b(E}99)EEN*db9bzqClI<d=bDwgz?O8;&09|5
zoLRKS<yKN4e5>r3_pM4*VAJ*H`6YjchoMosWP4)*N~~{2K%F35hk}TK4(LRr?UHq|
zR-CgcSIjxb66j33In$XjE4KV@ZmQmbP5;sKI;0szEt+;oU|Z~Zx<x+YRqRqB**Bwu
zNCVqsJj1i9o@6f>5@=Qm^t*K(oIs%9(n2ODJ#-uB!EUB&S7+@~$*TA{T@#38JTrH9
z$}Ia_J7~JsfQGP+eRxO1eg<ub))2+O0qG{RU{+^ck`{C!$^si#OV@M|(J(-j-cVgf
zKN3>GBh-sYxBF+p9W3&D8s1%1%gp_%XB7<`#W0z>HI_BnP|J1`mnfA-!7Q_wl)R4{
zcpoDI8w!>u>*3jwDr=b1F^Vw_Cn%aP^=hzzlQ<=ym8Cz25H*&P1?b1PfeD-z(2MS(
zFTND8Gq##~sxL*^%Y*VUL|F;~9kO5(?6j(e3q&+h9k&aoEz|Lp*O5X*KBf#@l%zG1
z&e#tu4VMJAzu6GuHQUKs6&;sxMMGw_Mt;i}xC-{FwrDyvYkHnKF^RQ}rDGZ&$s%N>
z#oF_}nJ}(1laXF&dBea>++y9$a@i{JDh;d$S>vV2mPJXyG%$x8%fS5BkZN4jqy}Cg
zYAi3QR82=71p^DP*}24Bu|0Xox?=y6&|L$LZ|k{@`y=aJl4Z?G3S|SIKz4rFl`Tsz
ztx(A@NGo!oR`q&$T(<Hfy-dHz`_<JnYcCtG?FKm;Y?hJ5VzpU&L7GabRwORRE->2N
z%RM%Qo^flHoORZgc|=}KuEVm-*vreOaK;7r7evTk@gni9@q`11&kg)a@GbZb#+P9H
z<eP2eGvsfEu!(D<VSvrp!mkc=Vk>tfc!>WJtUg0m3#&6EXrmz7hF7s2Z~68+UI#za
z#ETZV5%@qGkZtJ)7TEb3c#>gd;BdT-U5{4&m3Re`cq4e6SsrWi5pMd}<J%D_<OJhW
zX7MBWN`d0aX#7|7W=De0hgD_l3A%O!dxoa^>v;PSg6h+Uis*@|k5~TL_0)GG!|n8u
zNqQLNR2`$&Q`p0Gj8|N0*XtJ{-V7h$eh&^Z?l$TeLmzRHQWVMxa}2RG%u8s91Cao8
z;h=7k{DFaFJx?uTUv>$HCY$f{GWxT@-?^#8Gg<XeW(kL<e#Rh$IaWuqKOU~*gW1+b
zOX=Oz2sqE4NRi$J?8hVyBh9He#U7u2O+Sp|I76zS)e)TKO3=0&=g26)G|s=`D87U0
z%kg3vDRP{gB#HE>a^eXFyVcucB(aR?Y|k@%xP;lxYju1a@2=za3*_sV=T{wf>L@-8
zi0)mFSN<m0osy4>O<-r0Fjk{w+I}$5exMAiPjED<s<(%OO`~YAJ#JK8C$K7_DkJ~Z
z>ZUPYg{#zP1`*7%^|P$WHJsr33~o@hn^el=P?^IwoG;&E9^a#YI@f>Tu8+P<bQsT2
z!y+||;1}G(r_^v0hH;;(06iYW1FjVMTf}GhoO{!pE?;n^;31N}ol4JrzFp97n%z)e
dqEkakh=CQ>B`B8~^8B&E2N~f@#tY!9{{U~g(+2<m

diff --git a/bin/model/CardStack.class b/bin/model/CardStack.class
index ce4fd7a0d792cf851c17bfef2ef0bad2658d84b9..1a7713a28021a0a8c8318883940f3f08fdf67fb6 100644
GIT binary patch
delta 19
bcmZ3&w}fxQYPQMu*i0s`U^AX9#4ZE?Olk(B

delta 19
bcmZ3&w}fxQYPQLb*bFAGU^AaA#4ZE?Ooj%h

diff --git a/bin/model/Handler.class b/bin/model/Handler.class
deleted file mode 100644
index 3a3c5f59d85d3fb96ec031ff1ddd978283b47ce4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 741
zcmaJ<T}vB56g@ZDBpNp+#;>ZewpukV)CHkW7NITu2rRXr<bARk?Z{?V##R4A|4ko4
z!H52U{wV3avuSOilx4YJXYM`s%>1~&`wrj$yET*ujZrq#N%%pf!$jK}JVNV2-Ka28
z>3MiOxX^K4LzS@Zvg$Su^^H#R@Kv0fERD=nu2XFZp5-iodW6cQHL)f%lPp$(I!<3_
z$_^Qnn}iE~R7^eP=#Wr-X;PCP5w^O$-k+sk!Fx5*uEXJ8pPRg4%5{`6=c9o(q1@f;
zPlK@FV;WQ9E%~Sw-Xk9~@FlnEqmC(N6`53jydDj-Jyipt(~g*D(pT0<JV|=_XLBX!
zzXW2ol|iw~+@$hAj?v1g@=4pX%#Ji~ywQ#RDcoBT(XCT)dJ;PS0}|>d*|m-JyF$Rp
zeeFwcJmu}m{8!+iB#ZO?mP86?d1+@^250%sG0W&CM_(9MWxE=DLn~MtV?OANu^2ob
zV>wv###s64&a4T>A!m3-gL}{N*Tg(pSV0>dt{)Yhu#U$Z30@eG^Mq5$dBURXJmKXz
pZv#)5JMkWy6J9SkFL-(wUv;gP-KeFa_<Iz;96aMXVcQ+t`3Xg#j3EF3

diff --git a/bin/view/TileButton.class b/bin/view/TileButton.class
index 7b840b9139b5fa57a9c0ded00d7a86535dd5f1e9..4cdaa2525619c91c33e977bc62b8b1ac895e71d9 100644
GIT binary patch
delta 354
zcmYLD%}&B#5S(ohWBruMPX&RBC<;Zans`yXcrhm2Ot{z3keX5=5UxH$^F4_P*2IGk
z;1l>X#%(d0FPU$5XJ=*?Ym2n@`ThO@;2dY6HV<X@S{D%5A{3gvM`!NXz7q`X``N?`
zhF7h=h8zm3$P+T7@xb-%TW93njGf6qz`(W?RMSfW8rC%s$^sQsWtZx?U4a^^1a0ch
z`rg!g@LkzZ0)_5msF?CgaY&JuYWbNseuK4}eAN?Fr1&pc?KfnsP9;M26-7&puw$hn
zm@iB!*kd%X!l*N5S(@iF4HWs+d1@_9u#W@o*bWUGaztDmp~(($)#5!BJwhADzxfwT
b#3cRaq!XQ)_!>*{&zI1_3G)Oy5uW}4ltwQb

literal 1204
zcmZuwYflqV5IvW+RLWv`KP$>ZX&1{XpeRL@hd@cAAHW*@wzM~J&9WuCTkvOTqL64}
z;#Yr^@!Z`N5NUE>J2Pj_%$)xE{p|;US!|`zB9J{+^2FLzj$Ca9LBmZWDbVx5KDIwv
z{)uw;t?kGl(CJH0*-lk@zG}E{%IgARTcBgD;rfB?236Z>$`rBnPY5Ifq6!$5!$w^?
zVU7~NdeRLTSr$kgd8$T_)+ObtU|C=)U(uN@$7bH0z+?JSIS${n59MmZ_UffVl_+b(
z%pidt16lM6^j#BLsAkZQ!88U~XGG#0#lR4T1=9O6(8bdsUoKo`+6IA~fehL+yp0;T
zjXMIpz6@Azz#3LOX>TaUk#*9^zt_nG#tlqhlDPCMyMZr|$VZlY2BtJZhL)=G)t)2M
zD6oAIu`S!JJJQoxrw!ahhrSgJ80g3#4@;N%Kwu(Y{@V~u``Yek9<v7KFfY($*Xt{_
zfb*&-pRA=vj&ZB(lfaV4ti<})BW!TCqFni^dAKLNU7K75x+{$ur*BgOe8(S?!GU6t
zU6m^`(t~z6F&*~bNCnz8`PXhZPwHS#&sC#b8IndhU}HF)*c7*^l*S5Mc_Az<CR=G?
z^<S!P)3c8bRLu`768jW(L`GMBZX?c4qv_QohpBa-sYQ~X(abT%b|$FkB!-bfD_?28
zT5yAl>Im<gQh0K1JQMWEqLX_UU!Ul&{}qeo^clL%V(t`uUom1PPI1dT#h95q#oh17
zzcatU<hsu_k}IBJW-)0F(fIIli2aDW$&4Us3O&?FANN5FP{}!RD`EsQJm>g&icvhK
z=X{hI3wXj8Inc65Uiwxd*Ou_MglFVDN1n@g&N?YGOvdaNcxwMP&FUv!yuBck3B$+P
ri0Lqy5jn=m1Xi&YgJ|kHmADAjeFUs9us<@MvlLjzOWFlC!obZx7^e59

diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java
index fde4514..b57c1d8 100644
--- a/src/controller/Cashflow.java
+++ b/src/controller/Cashflow.java
@@ -11,17 +11,10 @@ public class Cashflow
 	private Player[] _players;
 	//private CardStack[] _cards;
 	
-	public static void main(String[] args)
-	{
-		/*
-		 * Just testing stuff in here for now. Main method will call the go() method when game is built
-		 */
-		testGamePlay();
-		
-	}
 
-	public void go()
+	public static void go()
 	{
+		System.out.println("Start game");
 		// Joe
 		// Initialize game board
 		// Initialize GUI
diff --git a/src/model/Handler.java b/src/model/Handler.java
deleted file mode 100644
index 8515231..0000000
--- a/src/model/Handler.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package model;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-
-public class Handler implements ActionListener {
-	private int rent, price, locationOnBoard;
-	private Tile tile;
-
-	public Handler(int price, int rent, Tile tile, int locationOnBoard,
-			GameBoard board) {
-		this.price = price;
-		this.rent = rent;
-		this.tile = tile;
-		this.locationOnBoard = locationOnBoard;
-
-	}
-
-	public void actionPerformed(ActionEvent event) {
-		// refer to getLandedOn? Or one of the decision/card windows? How do i do this i am tired 
-
-	}
-
-}
diff --git a/src/model/Instructions.java b/src/model/Instructions.java
new file mode 100644
index 0000000..665cdb8
--- /dev/null
+++ b/src/model/Instructions.java
@@ -0,0 +1,10 @@
+package model;
+
+public class Instructions 
+{
+	public static void getClicked()
+	{
+		System.out.println("You thought we were just going to GIVE you the instructions?");
+		System.out.println("HAHAHAHAH");
+	}
+}
diff --git a/src/view/MainMenu.java b/src/view/MainMenu.java
index a9b25e3..d5b97c3 100644
--- a/src/view/MainMenu.java
+++ b/src/view/MainMenu.java
@@ -1,8 +1,15 @@
 package view;
 
 import javax.imageio.ImageIO;
+
 import javax.swing.*;
+
+import controller.Cashflow;
+import model.Instructions;
+
 import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
@@ -11,7 +18,7 @@ public class MainMenu
 {
 	public static void main (String[] args)
 	{
-	JFrame frame = new JFrame("CashFlow");
+	final JFrame frame = new JFrame("CashFlow");
 
 	frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 	frame.setSize(650,530);
@@ -96,7 +103,32 @@ public class MainMenu
 	frame.add(panel3);
 	frame.add(panel4);
 	frame.add(panel5);
-	frame.setVisible(true);
+	frame.setVisible(true);	
 	
-	}
-}
+	newGame.addActionListener(new ActionListener() {
+		public void actionPerformed(ActionEvent e) {
+			frame.dispose();
+			Cashflow.go();
+		}          
+	});
+	
+	rules.addActionListener(new ActionListener() {
+		public void actionPerformed(ActionEvent e) {
+			frame.dispose();
+			Instructions.getClicked();
+		}          
+	});
+	
+	exit.addActionListener(new ActionListener() {
+		public void actionPerformed(ActionEvent e) {
+			System.exit(0);
+		}          
+	});
+	
+	
+	
+	
+	
+	
+	
+}}
diff --git a/src/view/TileButton.java b/src/view/TileButton.java
index c3c06c8..3aafc82 100644
--- a/src/view/TileButton.java
+++ b/src/view/TileButton.java
@@ -11,7 +11,6 @@ public class TileButton extends JButton {
 
 	private static final long serialVersionUID = 1L;
 	private Tile tile;
-	private int rent, price;
 
 	public TileButton(String name, int TileOnBoard, GameBoard board) {
 		super(name);
@@ -20,27 +19,11 @@ public class TileButton extends JButton {
 		// this.setOpaque(false);
 		this.setContentAreaFilled(false);
 		// this.setBorderPainted(false);
-
-		this.setInts();
 		this.setVisible(true);
-		Handler hand = new Handler(price, rent, tile, TileOnBoard,
-				board);
-		this.addActionListener(hand);
 
 	}
 
-	public void setInts() {
- 
-		if (this.tile instanceof Tile) {
-			/*
-			 * i dont actually really like this method 
-			 * but i think it should be like that iterator in cash flow
-			 * that determines moving over the tiles and if it's landed on
-			 * the gui should be brought up already in the handler method
-			 */
-		}
 
-	}
 
 	public void paint(Graphics g) { // Do nothing here }
 

From 675ca72633dc100e33a641646c814220a6d11f00 Mon Sep 17 00:00:00 2001
From: afortuna2016 <afortuna2016@50.28.173.85>
Date: Fri, 21 Apr 2017 21:05:20 -0400
Subject: [PATCH 06/10] main menu

---
 src/view/MainMenu.java | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/view/MainMenu.java b/src/view/MainMenu.java
index e107d25..6171bf0 100644
--- a/src/view/MainMenu.java
+++ b/src/view/MainMenu.java
@@ -230,6 +230,25 @@ public class MainMenu
 	frame.add(panel5);
 	frame.setVisible(true);
 	
+	newGame.addActionListener(new ActionListener() {
+		public void actionPerformed(ActionEvent e) {
+			frame.dispose();
+			Cashflow.go();
+		}          
+	});
+	
+	rules.addActionListener(new ActionListener() {
+		public void actionPerformed(ActionEvent e) {
+			frame.dispose();
+			Instructions.getClicked();
+		}          
+	});
+	
+	exit.addActionListener(new ActionListener() {
+		public void actionPerformed(ActionEvent e) {
+			System.exit(0);
+		}          
+});
 	}
 }
->>>>>>> branch 'master' of https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git
+

From 3f51761f393c586b2f678141e42ee76e7ee2f473 Mon Sep 17 00:00:00 2001
From: afortuna2016 <afortuna2016@50.28.173.85>
Date: Fri, 21 Apr 2017 21:13:04 -0400
Subject: [PATCH 07/10] main menuuu

---
 src/view/MainMenu.java | 139 ++---------------------------------------
 1 file changed, 6 insertions(+), 133 deletions(-)

diff --git a/src/view/MainMenu.java b/src/view/MainMenu.java
index 6171bf0..e4d1b87 100644
--- a/src/view/MainMenu.java
+++ b/src/view/MainMenu.java
@@ -1,149 +1,22 @@
 package view;
 
-import javax.imageio.ImageIO;
-
-import javax.swing.*;
-<<<<<<< HEAD
-
-import controller.Cashflow;
-import model.Instructions;
-
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
+import java.io.*;
 
-public class MainMenu 
-{
-	public static void main (String[] args)
-	{
-	final JFrame frame = new JFrame("CashFlow");
-
-	frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-	frame.setSize(650,530);
-	Dimension dimension = Toolkit.getDefaultToolkit().getScreenSize();
-	int x = (int) ((dimension.getWidth() - frame.getWidth()) / 2);
-	int y = (int) ((dimension.getHeight() - frame.getHeight()) / 2) -100; 
-	frame.setLocation(x, y);
-	
-	JPanel panel1 = new JPanel();
-	panel1.setSize(140, 45);
-	panel1.setLocation(255, 125);
-	panel1.setOpaque(false);
-	//Font font = new Font ("Times New Roman", Font.BOLD, 30);
-	//panel1.setFont(font);
-	
-	JPanel panel2 = new JPanel();
-	panel2.setSize(140, 45);
-	panel2.setLocation(255, 160);
-	panel2.setOpaque(false);
-	
-	JPanel panel3 = new JPanel();
-	panel3.setSize(140, 45);
-	panel3.setLocation(255, 260);
-	panel3.setOpaque(false);
-	
-	JPanel panel4 = new JPanel();
-	panel4.setSize(140, 45);
-	panel4.setLocation(255, 295);
-	panel4.setOpaque(false);
-	
-	JPanel panel5 = new JPanel();
-	panel5.setSize(140, 45);
-	panel5.setLocation(255, 330);
-	panel5.setOpaque(false);
-	
-	
-	JButton newGame = new JButton("New Game");
-	JButton savedGame = new JButton("Saved Game");
-	JButton rules = new JButton("Rules");
-	JButton settings = new JButton("Settings");
-	JButton exit = new JButton("Exit");
-
-	newGame.setPreferredSize(new Dimension(140,40));
-	newGame.setForeground(Color.MAGENTA);
-	
-	savedGame.setPreferredSize(new Dimension(130,40));
-	savedGame.setForeground(Color.MAGENTA);
-	
-	
-	rules.setPreferredSize(new Dimension(80,40));
-	rules.setForeground(Color.MAGENTA);
-	
-	
-	settings.setPreferredSize(new Dimension(120,40));
-	settings.setForeground(Color.MAGENTA);
-	
-	
-	exit.setPreferredSize(new Dimension(100,40));
-	exit.setForeground(Color.MAGENTA);
+import javax.imageio.ImageIO;
+import javax.swing.*;
 
-	
-	BufferedImage img = null;
-	try {
-	    img = ImageIO.read(new File("gameboard.png"));
-	} catch (IOException e) {
-	    e.printStackTrace();
-	}
-	Image dimg = img.getScaledInstance(800, 508, Image.SCALE_SMOOTH);
-	ImageIcon imageIcon = new ImageIcon(dimg);
-	frame.setContentPane(new JLabel(imageIcon));
-	frame.getContentPane().add(new JLabel(imageIcon));
-	
-	
-	panel1.add(newGame);
-	panel2.add(savedGame);
-	panel3.add(rules);
-	panel4.add(settings);
-	panel5.add(exit);
-	
-	frame.add(panel1);
-	frame.add(panel2);
-	frame.add(panel3);
-	frame.add(panel4);
-	frame.add(panel5);
-	frame.setVisible(true);	
-	
-	newGame.addActionListener(new ActionListener() {
-		public void actionPerformed(ActionEvent e) {
-			frame.dispose();
-			Cashflow.go();
-		}          
-	});
-	
-	rules.addActionListener(new ActionListener() {
-		public void actionPerformed(ActionEvent e) {
-			frame.dispose();
-			Instructions.getClicked();
-		}          
-	});
-	
-	exit.addActionListener(new ActionListener() {
-		public void actionPerformed(ActionEvent e) {
-			System.exit(0);
-		}          
-	});
-	
-	
-	
-	
-	
-	
-	
-}}
-=======
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
+import controller.Cashflow;
+import model.Instructions;
 
 public class MainMenu 
 {
 	public static void main (String[] args)
 	{
-	JFrame frame = new JFrame("CashFlow");
+	final JFrame frame = new JFrame("CashFlow");
 
 	frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 	frame.setSize(650,530);

From 58fdd3d8d7f6a824bce0183e3d5cb9cf0fab2b7b Mon Sep 17 00:00:00 2001
From: afortuna2016 <afortuna2016@137.99.150.47>
Date: Sat, 22 Apr 2017 13:00:08 -0400
Subject: [PATCH 08/10] can pick players now

---
 src/view/MainMenu.java | 80 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 70 insertions(+), 10 deletions(-)

diff --git a/src/view/MainMenu.java b/src/view/MainMenu.java
index e4d1b87..148b266 100644
--- a/src/view/MainMenu.java
+++ b/src/view/MainMenu.java
@@ -25,39 +25,74 @@ public class MainMenu
 	int y = (int) ((dimension.getHeight() - frame.getHeight()) / 2) -100; 
 	frame.setLocation(x, y);
 	
-	JPanel panel1 = new JPanel();
+	final JPanel panel1 = new JPanel();
 	panel1.setSize(140, 45);
 	panel1.setLocation(255, 125);
 	panel1.setOpaque(false);
 	//Font font = new Font ("Times New Roman", Font.BOLD, 30);
 	//panel1.setFont(font);
 	
-	JPanel panel2 = new JPanel();
+	final JPanel panel2 = new JPanel();
 	panel2.setSize(140, 45);
 	panel2.setLocation(255, 160);
 	panel2.setOpaque(false);
 	
-	JPanel panel3 = new JPanel();
+	final JPanel panel3 = new JPanel();
 	panel3.setSize(140, 45);
 	panel3.setLocation(255, 260);
 	panel3.setOpaque(false);
 	
-	JPanel panel4 = new JPanel();
+	final JPanel panel4 = new JPanel();
 	panel4.setSize(140, 45);
 	panel4.setLocation(255, 295);
 	panel4.setOpaque(false);
 	
-	JPanel panel5 = new JPanel();
+	final JPanel panel5 = new JPanel();
 	panel5.setSize(140, 45);
 	panel5.setLocation(255, 330);
 	panel5.setOpaque(false);
 	
+	final JPanel panel6 = new JPanel();
+	panel6.setSize(140, 45);
+	panel6.setLocation(180, 158);
+	panel6.setOpaque(false);
+	
+	final JPanel panel7 = new JPanel();
+	panel7.setSize(140, 45);
+	panel7.setLocation(260, 158);
+	panel7.setOpaque(false);
+	
+	final JPanel panel8 = new JPanel();
+	panel8.setSize(140, 45);
+	panel8.setLocation(340, 158);
+	panel8.setOpaque(false);
+	
+	final JPanel panel9 = new JPanel();
+	panel9.setSize(300, 45);
+	panel9.setLocation(185, 140);
+	panel9.setOpaque(false);
+	
+	final JPanel panel10 = new JPanel();
+	panel10.setSize(300, 45);
+	panel10.setLocation(175, 120);
+	panel10.setOpaque(false);
+	
+	
+	JLabel choose = new JLabel("Choose");
+	JLabel players = new JLabel("number of players");
+	choose.setFont(new Font("Verdana", 1, 16));
+	players.setFont(new Font("Verdana", 1, 16));
+	panel9.add(players);
+	panel10.add(choose);
 	
 	JButton newGame = new JButton("New Game");
 	JButton savedGame = new JButton("Saved Game");
 	JButton rules = new JButton("Rules");
 	JButton settings = new JButton("Settings");
 	JButton exit = new JButton("Exit");
+	JButton four = new JButton ("Four");
+	JButton five = new JButton ("Five");
+	JButton six = new JButton ("Six");
 
 	newGame.setPreferredSize(new Dimension(140,40));
 	newGame.setForeground(Color.MAGENTA);
@@ -65,18 +100,23 @@ public class MainMenu
 	savedGame.setPreferredSize(new Dimension(130,40));
 	savedGame.setForeground(Color.MAGENTA);
 	
-	
 	rules.setPreferredSize(new Dimension(80,40));
 	rules.setForeground(Color.MAGENTA);
 	
-	
 	settings.setPreferredSize(new Dimension(120,40));
 	settings.setForeground(Color.MAGENTA);
 	
-	
 	exit.setPreferredSize(new Dimension(100,40));
 	exit.setForeground(Color.MAGENTA);
+	
+	four.setPreferredSize(new Dimension(80,40));
+	four.setForeground(Color.MAGENTA);
 
+	five.setPreferredSize(new Dimension(80,40));
+	five.setForeground(Color.MAGENTA);
+	
+	six.setPreferredSize(new Dimension(80,40));
+	six.setForeground(Color.MAGENTA);
 	
 	BufferedImage img = null;
 	try {
@@ -95,6 +135,9 @@ public class MainMenu
 	panel3.add(rules);
 	panel4.add(settings);
 	panel5.add(exit);
+	panel6.add(four);
+	panel7.add(five);
+	panel8.add(six);
 	
 	frame.add(panel1);
 	frame.add(panel2);
@@ -105,8 +148,16 @@ public class MainMenu
 	
 	newGame.addActionListener(new ActionListener() {
 		public void actionPerformed(ActionEvent e) {
-			frame.dispose();
-			Cashflow.go();
+			frame.setVisible(false);
+			frame.remove(panel1);
+			frame.remove(panel2);
+			
+			frame.add(panel6);
+			frame.add(panel7);
+			frame.add(panel8);
+			frame.add(panel9);
+			frame.add(panel10);
+			frame.setVisible(true);	
 		}          
 	});
 	
@@ -117,11 +168,20 @@ public class MainMenu
 		}          
 	});
 	
+	four.addActionListener(new ActionListener() {
+		public void actionPerformed(ActionEvent e) {
+			frame.dispose();
+			Cashflow.go();
+			
+		}          
+	});
+	
 	exit.addActionListener(new ActionListener() {
 		public void actionPerformed(ActionEvent e) {
 			System.exit(0);
 		}          
 });
 	}
+	
 }
 

From 558489daecff36d1640bc5d742ba41fbff392210 Mon Sep 17 00:00:00 2001
From: afortuna2016 <afortuna2016@50.28.159.144>
Date: Sat, 22 Apr 2017 16:16:17 -0400
Subject: [PATCH 09/10] player names

---
 bin/controller/Cashflow.class | Bin 2234 -> 2234 bytes
 src/controller/Cashflow.java  |   2 -
 src/view/MainMenu.java        | 106 ++++++++++++++++++++++++++++++++--
 3 files changed, 102 insertions(+), 6 deletions(-)

diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class
index 530a3f7a917b49969ed2028f08d1d7bff5b3b1fd..d579444356f13c4bcf80cb5580ae561792919924 100644
GIT binary patch
delta 146
zcmdlbxJz(DF)OPm0|$fh<O)_(R&@q;29wE~ShGYe7?>C=8N?W@8Dtr38RUU%4F-qF
zhHT3uU4g3I7z7yH8B`cN81xuC8B7_x80;B*Hh*B_X0!|fN(VFWGK4S)F@ymP2nT8p
rVQ^)L0xF7T@Mnl)$Y6+PXk<uaXlF=f=w(P@*al?pXULdr!qEl*G$<M&

delta 146
zcmdlbxJz(DF)OP$0|$fZ<O)_(R!s(W2D8bVShGZ}7?>EW8N?WD8Dtsk8RUU%4F;#l
zhHT3u-GQn-7z7wR8B`d&81xvt8B7^`fNK0Ue_-Qgv<v}ChcfUogfR#)L;wwl1R4>>
q;K~pKR2<9T&yc{7!H~$%$dJs?&XCH`%aF#f4anZlkTuzaqYVH>jv8SA

diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java
index aa92a9f..8477a90 100644
--- a/src/controller/Cashflow.java
+++ b/src/controller/Cashflow.java
@@ -8,8 +8,6 @@ import model.*;
 
 public class Cashflow
 {
-
-	
 	private GameBoard _board;
 	public Player[] players;
 	//private CardStack[] _cards;
diff --git a/src/view/MainMenu.java b/src/view/MainMenu.java
index 148b266..bbda534 100644
--- a/src/view/MainMenu.java
+++ b/src/view/MainMenu.java
@@ -77,13 +77,36 @@ public class MainMenu
 	panel10.setLocation(175, 120);
 	panel10.setOpaque(false);
 	
+	final JPanel panel11 = new JPanel();
+	panel11.setSize(300, 50);
+	panel11.setLocation(175, 125);
+	panel11.setOpaque(false);
+	
+	final JPanel panel12 = new JPanel();
+	panel12.setSize(300, 50);
+	panel12.setLocation(175, 160);
+	panel12.setOpaque(false);
+	
+	final JPanel panel13 = new JPanel();
+	panel13.setSize(300, 50);
+	panel13.setLocation(125, 260);
+	panel13.setOpaque(false);
+	
+	final JPanel panel14 = new JPanel();
+	panel14.setSize(300, 50);
+	panel14.setLocation(250, 260);
+	panel14.setOpaque(false);
+	
+	final JPanel panel15 = new JPanel();
+	panel15.setSize(300, 50);
+	panel15.setLocation(175, 295);
+	panel15.setOpaque(false);
 	
 	JLabel choose = new JLabel("Choose");
 	JLabel players = new JLabel("number of players");
 	choose.setFont(new Font("Verdana", 1, 16));
 	players.setFont(new Font("Verdana", 1, 16));
-	panel9.add(players);
-	panel10.add(choose);
+	
 	
 	JButton newGame = new JButton("New Game");
 	JButton savedGame = new JButton("Saved Game");
@@ -93,6 +116,11 @@ public class MainMenu
 	JButton four = new JButton ("Four");
 	JButton five = new JButton ("Five");
 	JButton six = new JButton ("Six");
+	JTextField player1 = new JTextField("Player 1");
+	JTextField player2 = new JTextField("Player 2");
+	JTextField player3 = new JTextField("Player 3");
+	JTextField player4 = new JTextField("Player 4");
+	JButton start = new JButton("Start");
 
 	newGame.setPreferredSize(new Dimension(140,40));
 	newGame.setForeground(Color.MAGENTA);
@@ -118,6 +146,16 @@ public class MainMenu
 	six.setPreferredSize(new Dimension(80,40));
 	six.setForeground(Color.MAGENTA);
 	
+	start.setPreferredSize(new Dimension(100,40));
+	start.setForeground(Color.MAGENTA);
+	
+	player1.setPreferredSize(new Dimension(125,40));
+	player2.setPreferredSize(new Dimension(125,40));
+	player3.setPreferredSize(new Dimension(125,40));
+	player4.setPreferredSize(new Dimension(125,40));
+	
+	
+	
 	BufferedImage img = null;
 	try {
 	    img = ImageIO.read(new File("gameboard.png"));
@@ -138,6 +176,13 @@ public class MainMenu
 	panel6.add(four);
 	panel7.add(five);
 	panel8.add(six);
+	panel9.add(players);
+	panel10.add(choose);
+	panel11.add(player1);
+	panel12.add(player2);
+	panel13.add(player3);
+	panel14.add(player4);
+	panel15.add(start);
 	
 	frame.add(panel1);
 	frame.add(panel2);
@@ -170,9 +215,21 @@ public class MainMenu
 	
 	four.addActionListener(new ActionListener() {
 		public void actionPerformed(ActionEvent e) {
-			frame.dispose();
-			Cashflow.go();
+			frame.setVisible(false);
+			frame.remove(panel3);
+			frame.remove(panel4);
+			frame.remove(panel6);
+			frame.remove(panel7);
+			frame.remove(panel8);
+			frame.remove(panel9);
+			frame.remove(panel10);
 			
+			frame.add(panel11);
+			frame.add(panel12);
+			frame.add(panel13);
+			frame.add(panel14);
+			frame.add(panel15);
+			frame.setVisible(true);
 		}          
 	});
 	
@@ -181,6 +238,47 @@ public class MainMenu
 			System.exit(0);
 		}          
 });
+	
+	player1.addActionListener(new ActionListener() {
+		public void actionPerformed(ActionEvent e) {
+			
+			
+			System.exit(0);
+		}          
+});
+	
+	player2.addActionListener(new ActionListener() {
+		public void actionPerformed(ActionEvent e) {
+			
+			
+			System.exit(0);
+		}          
+});
+	player3.addActionListener(new ActionListener() {
+		public void actionPerformed(ActionEvent e) {
+			
+			
+			System.exit(0);
+		}          
+});
+	
+	player4.addActionListener(new ActionListener() {
+		public void actionPerformed(ActionEvent e) {
+			
+			
+			System.exit(0);
+		}          
+});
+	
+	start.addActionListener(new ActionListener() {
+		public void actionPerformed(ActionEvent e) {
+			frame.dispose();
+			Cashflow.go();
+			System.exit(0);
+		}          
+});
+	
+	
 	}
 	
 }

From 53cc8cb2cc689bb966ca2ffb5d37da7ad1d50fc1 Mon Sep 17 00:00:00 2001
From: Sara-Sadiya <Sara-Sadiya@MyPreciousJr>
Date: Sun, 23 Apr 2017 14:34:35 -0400
Subject: [PATCH 10/10] got rid of git's comments

---
 src/model/FinancialStatement.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/model/FinancialStatement.java b/src/model/FinancialStatement.java
index c3f2d1d..d96f3e5 100644
--- a/src/model/FinancialStatement.java
+++ b/src/model/FinancialStatement.java
@@ -204,10 +204,7 @@ public class FinancialStatement
 	{
 		return _totalIncome;
 	}
-	
-<<<<<<< HEAD
 
-=======
 	//income getters
 	public int getIncome() 
 	{