diff --git a/src/json-20140107.jar b/src/json-20140107.jar
new file mode 100644
index 0000000000000000000000000000000000000000..40a325dbadf46a178fb60a8251c796dacf1f66be
Binary files /dev/null and b/src/json-20140107.jar differ
diff --git a/src/json-simple-1.1.1.jar b/src/json-simple-1.1.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..66347a6c86b7d6442358ca7643e4dc484fb01866
Binary files /dev/null and b/src/json-simple-1.1.1.jar differ
diff --git a/src/server/Server.java b/src/server/Server.java
index df72b214a6220ef0414795c1bf2d7aa40d1b77ec..32b37c5f7d9374f505bbe2a9dc546173673b8acd 100644
--- a/src/server/Server.java
+++ b/src/server/Server.java
@@ -14,12 +14,12 @@ import org.json.JSONObject;
 
 public class Server implements Runnable
 {
-<<<<<<< HEAD
+
 	private Paxos paxos;
 	private String host;
-=======
+
     private String host;
->>>>>>> ea38ce9783fbf5ff22ca116817d787e2b4816894
+
     private int port;
     private Socket socket;
     private final String DEFAULT_HOST = "localhost";
@@ -123,8 +123,6 @@ public class Server implements Runnable
 			}
 		}
 	}
-<<<<<<< HEAD
-=======
         
         public String receiveMessage() throws IOException{
             String temp = null;
@@ -141,7 +139,5 @@ public class Server implements Runnable
     public void run() {
         throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
     }
-       	
->>>>>>> ea38ce9783fbf5ff22ca116817d787e2b4816894
 
 }
\ No newline at end of file
diff --git a/src/server/SisterServer.java b/src/server/SisterServer.java
index 2edc01783593a060ae8c5c31e7a61a57be248ae8..3db477d93bc285481ad60d6482f2df8b9fe2b5d0 100644
--- a/src/server/SisterServer.java
+++ b/src/server/SisterServer.java
@@ -41,8 +41,14 @@ public class SisterServer {
             System.out.println(request);
             JSONObject j = new JSONObject(request);
             System.out.println(j.get("method"));*/
+            private int sequenceID;
+            private int processID;
+            int 
             Client c = new Client(1,9999);
             c.receiveMessageFromClient("localhost", 8888);
+
+            // creating consensus
+
     }
     
 }