From 9efaf16e6361b3b92680ca90e3f6b95d36e0c20a Mon Sep 17 00:00:00 2001
From: Joe <Joe@localhost>
Date: Fri, 3 Mar 2017 00:16:03 -0500
Subject: [PATCH] idk whats going on

---
 bin/controller/Cashflow.class | Bin 425 -> 579 bytes
 src/controller/Cashflow.java  |   1 +
 src/model/Market_Cards.java   |   4 ++--
 src/view/MainWindow.java      |   7 +++++-
 src/view/MainWindow1.java     |  42 ++++++++++++++++++++++++++++++++++
 5 files changed, 51 insertions(+), 3 deletions(-)
 create mode 100644 src/view/MainWindow1.java

diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class
index 6d77dff1c0a7cc0adfa5e79aa054c0b0958ee080..3963c5c78619282100e18e82fe72c4e367467dcc 100644
GIT binary patch
delta 242
zcmZ3<e3*sn)W2Q(7#J8#7*r>6ov-I)5MdBwXAos%5Xed_OVrOv%uCk~t}HG|&E;Vb
zXOLiIV9qZsVPp{X0ZV7*>jxBN=9L7O6s0EST5~W+F*2}vq~_%0b1}#;$gwlXGBOBb
zQOUy~&!E7_z+M2-oRbGMPXlZqKh(k!pm@5qX4u4=6MP&Qm>3v=F67_MAh4Z5XcL35
xkmNQ7>5V`kCI&7b$;ZG9Bsm$_fIL11ZXje};DKmiP-IX7@)#MEfg}@y3IIf+GhF}x

delta 87
zcmX@ivXYtW)W2Q(7#J8#7{n)Xou8b}IKjb`fe{E97}$3+2yAB%+6ZJaF>nD%E+Eao
dz{$V{WN`yoJP>6J!VDrn9wUP&kYr*I0{{xF3uXWS

diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java
index 83039bb..ec0ad31 100644
--- a/src/controller/Cashflow.java
+++ b/src/controller/Cashflow.java
@@ -7,5 +7,6 @@ public class Cashflow
 	public static void main(String[] args)
 	{
 		new MainWindow();
+		System.out.println("Hello");
 	}
 }
diff --git a/src/model/Market_Cards.java b/src/model/Market_Cards.java
index b5b25b1..c00e108 100644
--- a/src/model/Market_Cards.java
+++ b/src/model/Market_Cards.java
@@ -105,8 +105,8 @@ public static void main(String[] args) {
 		/* Need a decision function
 		 *Need separate functionalities (if statements) based on card type
 		 * Need a way that every player who is affected gets the decision option
-		 */ Do we check if they have the proper real estate needed? Or do we assume the player knows and obviously make it so they can't sell something they don't have
-		
+		 * Do we check if they have the proper real estate needed? Or do we assume the player knows and obviously make it so they can't sell something they don't have
+		*/
 	}
 	
 }
diff --git a/src/view/MainWindow.java b/src/view/MainWindow.java
index b1a94ed..ea95c70 100644
--- a/src/view/MainWindow.java
+++ b/src/view/MainWindow.java
@@ -45,6 +45,11 @@ private void initialize() {
 		
 		JPanel panel = new JPanel();
 		panel.setBackground(new Color(186,85,211));
-		frame.add(panel);
+		frame.getContentPane().add(panel);
+		panel.setLayout(null);
+		
+		JPanel panel_1 = new JPanel();
+		panel_1.setBounds(6, 6, 48, 47);
+		panel.add(panel_1);
 	}
 }
diff --git a/src/view/MainWindow1.java b/src/view/MainWindow1.java
new file mode 100644
index 0000000..b68860b
--- /dev/null
+++ b/src/view/MainWindow1.java
@@ -0,0 +1,42 @@
+package view;
+
+import java.awt.BorderLayout;
+import java.awt.EventQueue;
+
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.border.EmptyBorder;
+
+public class MainWindow1 extends JFrame {
+
+	private JPanel contentPane;
+
+	/**
+	 * Launch the application.
+	 */
+	public static void main(String[] args) {
+		EventQueue.invokeLater(new Runnable() {
+			public void run() {
+				try {
+					MainWindow1 frame = new MainWindow1();
+					frame.setVisible(true);
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+			}
+		});
+	}
+
+	/**
+	 * Create the frame.
+	 */
+	public MainWindow1() {
+		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+		setBounds(100, 100, 450, 300);
+		contentPane = new JPanel();
+		contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
+		contentPane.setLayout(new BorderLayout(0, 0));
+		setContentPane(contentPane);
+	}
+
+}