From 675235a550ff1aa861a7d9b10782cfd62de83efd Mon Sep 17 00:00:00 2001
From: JazzieStarr <shaj0300@gmail.com>
Date: Sun, 29 Jan 2017 17:19:10 -0400
Subject: [PATCH 1/4] Added header file

---
 House.h | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 House.h

diff --git a/House.h b/House.h
new file mode 100644
index 0000000..03ca667
--- /dev/null
+++ b/House.h
@@ -0,0 +1,20 @@
+#ifndef HOUSE_H
+#define HOUSE_H
+#include <iostream>
+#include <string>
+using namespace std;
+
+class House
+{
+	private:
+	string colour;
+	int room;
+
+	public:
+	House ();
+	void setColour (string);
+	string getColour ();
+	void setRoom (int);
+	int getRoom ();
+};
+#endif

From 370ebb0ac94ab1058c93775a870bde7b98a37a0c Mon Sep 17 00:00:00 2001
From: JazzieStarr <shaj0300@gmail.com>
Date: Sun, 29 Jan 2017 18:25:58 -0400
Subject: [PATCH 2/4] Added implementation file

---
 House.cpp | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 House.cpp

diff --git a/House.cpp b/House.cpp
new file mode 100644
index 0000000..c11aef6
--- /dev/null
+++ b/House.cpp
@@ -0,0 +1,30 @@
+#include <iostream>
+#include <string>
+using namespace std;
+#include "House.h"
+
+House::House()
+{
+	colour = "";
+	room = 0;
+}
+
+void House::setColour(string x)
+{
+	colour = x;
+}
+
+string House::getColour()
+{
+	return colour;
+}
+
+void House::setRoom(int v)
+{
+	room = v;
+}
+
+int House::getRoom()
+{
+	return room;
+}

From 2e68004b7b85c8cf060d67dcecd05cca27a7523a Mon Sep 17 00:00:00 2001
From: JazzieStarr <shaj0300@gmail.com>
Date: Sun, 29 Jan 2017 18:51:38 -0400
Subject: [PATCH 3/4] Added client file

---
 myDreamHouse.cpp | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 myDreamHouse.cpp

diff --git a/myDreamHouse.cpp b/myDreamHouse.cpp
new file mode 100644
index 0000000..8b39049
--- /dev/null
+++ b/myDreamHouse.cpp
@@ -0,0 +1,28 @@
+#include <iostream>
+#include <string>
+#include <vector>
+using namespace std;
+#include "House.h"
+
+int main()
+{
+	vector<House>D;
+	House design;
+	design.setColour("yellow");
+	design.setRoom(6)
+	D.push_back(design);
+	design.setColour("blue");
+	design.setRoom(9)
+	D.push_back(design);
+	design.setColour("orange");
+	design.setRoom(7)
+	D.push_back(design);
+	design.setColour("white");
+	design.setRoom(6)
+	D.push_back(design);
+	for(int i=0;i<D.size();i++)
+	{
+		cout<<"Colour of house: "<<D[i].getColour()<<" and number of rooms in house: "<<D[i].getRoom()<<endl;
+	}
+}
+

From d8b3675a36b7ee4cb2c397c9a625abadf2763103 Mon Sep 17 00:00:00 2001
From: JazzieStarr <shaj0300@gmail.com>
Date: Sun, 29 Jan 2017 19:16:36 -0400
Subject: [PATCH 4/4] Added missing ';' to client file

---
 myDreamHouse.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/myDreamHouse.cpp b/myDreamHouse.cpp
index 8b39049..180447f 100644
--- a/myDreamHouse.cpp
+++ b/myDreamHouse.cpp
@@ -9,16 +9,16 @@ int main()
 	vector<House>D;
 	House design;
 	design.setColour("yellow");
-	design.setRoom(6)
+	design.setRoom(6);
 	D.push_back(design);
 	design.setColour("blue");
-	design.setRoom(9)
+	design.setRoom(9);
 	D.push_back(design);
 	design.setColour("orange");
-	design.setRoom(7)
+	design.setRoom(7);
 	D.push_back(design);
 	design.setColour("white");
-	design.setRoom(6)
+	design.setRoom(6);
 	D.push_back(design);
 	for(int i=0;i<D.size();i++)
 	{