diff --git a/bin/.gitignore b/bin/.gitignore
index 66905d0..f168c3b 100644
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -1,4 +1,7 @@
+<<<<<<< HEAD
 /.DS_Store
+=======
+>>>>>>> branch 'master' of https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git
 /controller/
 /model/
 /view/
diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class
index 37ff42f..3c071d6 100644
Binary files a/bin/controller/Cashflow.class and b/bin/controller/Cashflow.class differ
diff --git a/bin/model/Profession.class b/bin/model/Profession.class
index 8fdeb61..8206775 100644
Binary files a/bin/model/Profession.class and b/bin/model/Profession.class differ
diff --git a/bin/view/Window.class b/bin/view/Window.class
index c68be93..fe71bb5 100644
Binary files a/bin/view/Window.class and b/bin/view/Window.class differ
diff --git a/src/model/FinacialStatement.java b/src/model/FinacialStatement.java
index f34997c..592dd4b 100644
--- a/src/model/FinacialStatement.java
+++ b/src/model/FinacialStatement.java
@@ -2,5 +2,49 @@
 
 public class FinacialStatement
 {
+	private double salary;
+	private double interest;
+	private double[] realEstate;
+	private String career;
+	private double expenses;
+	private double assets;
+	private double liabilities;
+	private double income;
 	
+	Profession p = new Profession("Teacher", 3300, 500, 500, 100, 100, 200, 700, 0, 0, 
+			200, 400, 50000, 12000, 5000, 4000);
+	
+	public double expenses()
+	{
+		expenses = p.getTaxes() + p.getMortgagePay() + p.getSchoolLoanPay() + p.getCarLoanPay()
+					+ p.getCreditCardPay() + p.getOtherExp() + p.getBankLoanPay() + p.getChildExp();
+		return expenses;
+	}
+	
+	public double assets()
+	{
+		assets = p.getSavings();
+		
+		return assets;
+	}
+	
+	public double liabilities()
+	{
+		liabilities = p.getMortgage() + p.getSchoolLoans() + p.getCarLoans() + p.getCreditCardDebt();
+		return liabilities;
+	}
+	
+	public double income()
+	{
+		income = p.getSalary();
+		return income;
+	}
+	public void FinancialStatement()
+	{
+		
+	}
+	public void display()
+	{
+		
+	}
 }
diff --git a/src/model/Professions.java b/src/model/Professions.java
index 9755f44..2d8b6b3 100644
--- a/src/model/Professions.java
+++ b/src/model/Professions.java
@@ -56,6 +56,6 @@ public Profession getProfession()
 		return profs[n];
 	}
 	
-	
+
 	
 }
\ No newline at end of file