From cbcfa0fc64bf1329243d51d5805edbdb99ad4212 Mon Sep 17 00:00:00 2001
From: jsn13002 <jsn13002@ITESTA46.ad.engr.uconn.edu>
Date: Fri, 26 Feb 2016 11:05:37 -0500
Subject: [PATCH 1/4] commit the activity and food and menu

---
 Party_APP/src/model/activity.java    | 16 ++++++
 Party_APP/src/model/foodAndMenu.java | 78 ++++++++++++++++++++++++++++
 2 files changed, 94 insertions(+)
 create mode 100644 Party_APP/src/model/activity.java
 create mode 100644 Party_APP/src/model/foodAndMenu.java

diff --git a/Party_APP/src/model/activity.java b/Party_APP/src/model/activity.java
new file mode 100644
index 0000000..8c12547
--- /dev/null
+++ b/Party_APP/src/model/activity.java
@@ -0,0 +1,16 @@
+package model;
+
+public class activity {
+	public String title;
+	public String details;
+	public String misc;
+	// Constructor 
+		public activity(String a, String b, String c){
+			this.title=a;
+			this.details=b;
+			this.misc=c;
+		}
+		activity newactivity;
+		activity joke;
+		activity games;
+}
diff --git a/Party_APP/src/model/foodAndMenu.java b/Party_APP/src/model/foodAndMenu.java
new file mode 100644
index 0000000..a0c94c4
--- /dev/null
+++ b/Party_APP/src/model/foodAndMenu.java
@@ -0,0 +1,78 @@
+package model;
+
+public class foodAndMenu {
+	public String foodname; 
+	//We need to add the image in the foodAndMenu Contructor 
+	public String descriptionfood;
+	public String recipe;
+	
+	//Constructor 
+	public foodAndMenu(String a,String s, String k){
+		this.foodname=a;
+		this.descriptionfood=s;
+		this.recipe=k;
+	}
+	 foodAndMenu appetizer;
+	 foodAndMenu entree;
+	 foodAndMenu desert;
+	 foodAndMenu snack;
+	 //Getters 
+	 public void setEntree(String x, String s, String k){
+		 entree.foodname=x;
+		 entree.descriptionfood=s;
+		 entree.recipe=k;
+	 }
+	 public void setappetizer(String x,String s, String k){
+		 appetizer.foodname=x;
+		 appetizer.descriptionfood=s;
+		 appetizer.recipe=k;
+	 }
+	 public void setdesert (String x,String s, String k){
+		 desert.foodname=x;
+		 desert.descriptionfood=s;
+		 desert.recipe=k;
+	 }
+	 public void setsnack(String x,String s, String k){
+		 snack.foodname=x;
+		 snack.descriptionfood=s;
+		 snack.recipe=k;
+	 }
+	 //Setters
+	 public foodAndMenu getAppetizer(String k){
+		 if (appetizer.foodname.equalsIgnoreCase(k)){
+			 return appetizer;
+		 }
+		 else {
+			 System.out.println("There is no such item on the menu");
+			 return null;
+		 }
+	 }
+	 public foodAndMenu getDesert(String k){
+		 if (desert.foodname.equalsIgnoreCase(k)){
+			 return desert;
+		 }
+		 else {
+			 System.out.println("There is no such item on the menu");
+			 return null;
+		 }
+	 }
+	 public foodAndMenu getSnack(String k){
+		 if (snack.foodname.equalsIgnoreCase(k)){
+			 return snack;
+		 }
+		 else {
+			 System.out.println("There is no such item on the menu");
+			 return null;
+		 }
+	 }
+	 public foodAndMenu getEntree(String k){
+		 if (entree.foodname.equalsIgnoreCase(k)){
+			 return entree;
+		 }
+		 else {
+			 System.out.println("There is no such item on the menu");
+			 return null;
+		 }
+	 }
+
+}

From c480202a451188bbe3d09f7b4a5397e3c86b0c18 Mon Sep 17 00:00:00 2001
From: jsn13002 <jsn13002@ITESTA46.ad.engr.uconn.edu>
Date: Fri, 26 Feb 2016 11:06:52 -0500
Subject: [PATCH 2/4] stuff

---
 Party_APP/bin/.gitignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 Party_APP/bin/.gitignore

diff --git a/Party_APP/bin/.gitignore b/Party_APP/bin/.gitignore
new file mode 100644
index 0000000..cc8e1fb
--- /dev/null
+++ b/Party_APP/bin/.gitignore
@@ -0,0 +1 @@
+/model

From e3ef5d552b1d9f1f20568300c334e6553457e719 Mon Sep 17 00:00:00 2001
From: jsn13002 <jsn13002@ITESTA46.ad.engr.uconn.edu>
Date: Fri, 26 Feb 2016 11:09:08 -0500
Subject: [PATCH 3/4] hello

---
 Party_APP/src/model/foodAndMenu.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Party_APP/src/model/foodAndMenu.java b/Party_APP/src/model/foodAndMenu.java
index a0c94c4..b7420eb 100644
--- a/Party_APP/src/model/foodAndMenu.java
+++ b/Party_APP/src/model/foodAndMenu.java
@@ -3,6 +3,7 @@ package model;
 public class foodAndMenu {
 	public String foodname; 
 	//We need to add the image in the foodAndMenu Contructor 
+	//to commit 
 	public String descriptionfood;
 	public String recipe;
 	

From eb6a9ecaf35d5adce4eddb8de939ebe75c689a34 Mon Sep 17 00:00:00 2001
From: Brianna M Rivera <brianna.rivera@uconn.edu>
Date: Fri, 26 Feb 2016 11:19:05 -0500
Subject: [PATCH 4/4] Delete .gitignore

---
 Party_APP/bin/.gitignore | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 Party_APP/bin/.gitignore

diff --git a/Party_APP/bin/.gitignore b/Party_APP/bin/.gitignore
deleted file mode 100644
index cc8e1fb..0000000
--- a/Party_APP/bin/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/model