diff --git a/ProyectoAndroid/ChessTrack/AndroidManifest.xml b/ProyectoAndroid/ChessTrack/AndroidManifest.xml
index ec4ede675a0383c7122aaaf4a7ddd40d99822091..996edd019bf650805d4125459a26a78f71c9f254 100644
--- a/ProyectoAndroid/ChessTrack/AndroidManifest.xml
+++ b/ProyectoAndroid/ChessTrack/AndroidManifest.xml
@@ -3,8 +3,6 @@
     android:versionCode="1"
     android:versionName="1.0" >
 
-   
-
 <!--     <application -->
 <!--         android:allowBackup="true" -->
 <!--         android:icon="@drawable/ic_launcher" -->
@@ -12,8 +10,6 @@
 <!--         android:theme="@style/AppTheme" > -->
 <!--     </application> -->
  
- 
- 
     <application
          android:allowBackup="true"
         android:label="@string/app_name"
@@ -30,22 +26,21 @@
             </intent-filter>
         </activity>
     </application>
-
-  
        
     <supports-screens android:resizeable="true"
                       android:smallScreens="true"
                       android:normalScreens="true"
                       android:largeScreens="true"
                       android:anyDensity="true" />
-   
      
      <uses-sdk
         android:minSdkVersion="9"
         android:targetSdkVersion="10" />
     
-     <uses-permission android:name="android.permission.CAMERA"/>
-
+	<uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
+	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+	
     <uses-feature android:name="android.hardware.camera" android:required="false"/>
     <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
     <uses-feature android:name="android.hardware.camera.front" android:required="false"/>
diff --git a/ProyectoAndroid/ChessTrack/src/uy/edu/chesstrack/communication/Client.java b/ProyectoAndroid/ChessTrack/src/uy/edu/chesstrack/communication/Client.java
new file mode 100644
index 0000000000000000000000000000000000000000..2d297b38685269761be9c8bd7dc744c3a0d260f2
--- /dev/null
+++ b/ProyectoAndroid/ChessTrack/src/uy/edu/chesstrack/communication/Client.java
@@ -0,0 +1,67 @@
+package uy.edu.chesstrack.communication;
+
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.UnknownHostException;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.EditText;
+
+public class Client extends Activity {
+
+	private Socket socket;
+
+	private static final int SERVERPORT = 5000;
+	private static final String SERVER_IP = "10.0.2.2";
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+//		setContentView(R.layout.main);		
+
+		new Thread(new ClientThread()).start();
+	}
+
+	public void onClick(View view) {
+		try {
+	//		EditText et = (EditText) findViewById(R.id.EditText01);
+		//	String str = et.getText().toString();
+			PrintWriter out = new PrintWriter(new BufferedWriter(
+					new OutputStreamWriter(socket.getOutputStream())),
+					true);
+			//out.println(str);
+		} catch (UnknownHostException e) {
+			e.printStackTrace();
+		} catch (IOException e) {
+			e.printStackTrace();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	class ClientThread implements Runnable {
+
+		@Override
+		public void run() {
+
+			try {
+				InetAddress serverAddr = InetAddress.getByName(SERVER_IP);
+
+				socket = new Socket(serverAddr, SERVERPORT);
+
+			} catch (UnknownHostException e1) {
+				e1.printStackTrace();
+			} catch (IOException e1) {
+				e1.printStackTrace();
+			}
+
+		}
+
+	}
+}
\ No newline at end of file
diff --git a/ProyectoAndroid/ChessTrack/src/uy/edu/chesstrack/communication/Server.java b/ProyectoAndroid/ChessTrack/src/uy/edu/chesstrack/communication/Server.java
new file mode 100644
index 0000000000000000000000000000000000000000..5ac4add01b7fdce95552411072547291f94a7dac
--- /dev/null
+++ b/ProyectoAndroid/ChessTrack/src/uy/edu/chesstrack/communication/Server.java
@@ -0,0 +1,114 @@
+package uy.edu.chesstrack.communication;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.UnknownHostException;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.os.Handler;
+import android.widget.TextView;
+
+public class Server {
+
+	private ServerSocket serverSocket;
+	Handler updateConversationHandler;
+	Thread serverThread = null;
+	private TextView text;
+
+	public static final int SERVERPORT = 6000;
+
+	public Server() {
+		updateConversationHandler = new Handler();
+		this.serverThread = new Thread(new ServerThread());
+		this.serverThread.start();
+	}
+
+	public void Stop() {
+		try {
+			serverSocket.close();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	class ServerThread implements Runnable {
+
+		public void run() {
+			Socket socket = null;
+			try {
+				serverSocket = new ServerSocket(SERVERPORT);
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+
+			while (!Thread.currentThread().isInterrupted()) {
+				try {
+					socket = serverSocket.accept();
+
+					CommunicationThread commThread = new CommunicationThread(socket);
+					new Thread(commThread).start();
+
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+	}
+
+	class CommunicationThread implements Runnable {
+
+		private Socket clientSocket;
+		private BufferedReader input;
+		private BufferedWriter output;
+
+		public CommunicationThread(Socket clientSocket) {
+			this.clientSocket = clientSocket;
+
+			try {
+				this.input = new BufferedReader(new InputStreamReader(this.clientSocket.getInputStream()));
+				this.output = new BufferedWriter(new OutputStreamWriter(this.clientSocket.getOutputStream()));
+				
+				String str = "AYLEN RICCA";
+				PrintWriter out = new PrintWriter(this.output);
+				out.println(str);
+
+			} catch (IOException e) {
+				e.printStackTrace();
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+
+		public void run() {
+			while (!Thread.currentThread().isInterrupted()) {
+				try {
+					String read = input.readLine();
+					updateConversationHandler.post(new updateUIThread(read));
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+
+	}
+
+	class updateUIThread implements Runnable {
+		private String msg;
+
+		public updateUIThread(String str) {
+			this.msg = str;
+		}
+
+		@Override
+		public void run() {
+			text.setText(text.getText().toString()+"Client Says: "+ msg + "\n");
+		}
+	}
+}
\ No newline at end of file