diff --git a/.classpath b/.classpath
index aa96ce4..25d6c4a 100644
--- a/.classpath
+++ b/.classpath
@@ -5,5 +5,6 @@
 	<classpathentry kind="lib" path="gson-2.8.6-javadoc.jar"/>
 	<classpathentry kind="lib" path="gson-2.8.6-sources.jar"/>
 	<classpathentry kind="lib" path="gson-2.8.6.jar"/>
+	<classpathentry kind="lib" path="cifrado.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/cifrado.jar b/cifrado.jar
new file mode 100644
index 0000000..f672826
Binary files /dev/null and b/cifrado.jar differ
diff --git a/src/Main.java b/src/Main.java
index 8057a60..33ab749 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -9,7 +9,7 @@ import java.util.Scanner;
 import com.google.gson.Gson;
 
 public class Main {
-
+	static String pass="soy segura";
 	public static void main(String[] args) {
 		System.out.println("Entra cliente");
 		Socket socket;
@@ -24,13 +24,13 @@ public class Main {
 			Scanner es = new Scanner(System.in);
 			BufferedReader bufferEntrada = new BufferedReader(new InputStreamReader(socket.getInputStream()));
 			PrintWriter bufferSalida = new PrintWriter(new OutputStreamWriter(socket.getOutputStream()),true);
-			String entrada = gson.fromJson(bufferEntrada.readLine(), String.class);
+			String entrada = gson.fromJson(Cifrado.desencriptar(bufferEntrada.readLine(), pass), String.class);
 			System.out.println(entrada);
 			
 			System.out.println("Introduce el numero de partida en el que quieres entrar");
-			bufferSalida.println(es.nextLine());
-			System.out.println(gson.fromJson(bufferEntrada.readLine(), String.class));
-			String tipoJuego = gson.fromJson(bufferEntrada.readLine(), String.class);
+			bufferSalida.println(Cifrado.cifrar(gson.toJson(es.nextLine()), pass));
+			System.out.println(gson.fromJson(Cifrado.desencriptar(bufferEntrada.readLine(), pass), String.class));
+			String tipoJuego = gson.fromJson(Cifrado.desencriptar(bufferEntrada.readLine(), pass), String.class);
 			switch(tipoJuego) {
 			case "3":
 				partida3(bufferEntrada, bufferSalida, es);
@@ -47,29 +47,30 @@ public class Main {
 	
 	static void partida3(BufferedReader bufferEntrada, PrintWriter bufferSalida, Scanner es) throws IOException {
 		Gson gson = new Gson();
-		System.out.println(gson.fromJson(bufferEntrada.readLine(), String.class));
-		System.out.println(gson.fromJson(bufferEntrada.readLine(), String.class));
+		System.out.println(gson.fromJson(Cifrado.desencriptar(bufferEntrada.readLine(), pass), String.class));
+		System.out.println(gson.fromJson(Cifrado.desencriptar(bufferEntrada.readLine(), pass), String.class));
 		while(dibujarTablero(bufferEntrada)) {
 			System.out.println("introduce la x de la nueva marca");
-			bufferSalida.println(es.nextLine());
+			bufferSalida.println(Cifrado.cifrar(gson.toJson(es.nextLine()), pass));
 			System.out.println("introduce la y de la nueva marca");
-			bufferSalida.println(es.nextLine());
+			bufferSalida.println(Cifrado.cifrar(gson.toJson(es.nextLine()), pass));
 		}
 	}
 	
 	static void partida4(BufferedReader bufferEntrada, PrintWriter bufferSalida, Scanner es) throws IOException {
 		Gson gson = new Gson();
-		System.out.println(gson.fromJson(bufferEntrada.readLine(), String.class));
-		System.out.println(gson.fromJson(bufferEntrada.readLine(), String.class));
+		System.out.println(gson.fromJson(Cifrado.desencriptar(bufferEntrada.readLine(), pass), String.class));
+		System.out.println(gson.fromJson(Cifrado.desencriptar(bufferEntrada.readLine(), pass), String.class));
 		while(dibujarTablero(bufferEntrada)) {
 			System.out.println("introduce la columna de la nueva ficha");
-			bufferSalida.println(gson.fromJson(es.nextLine(), String.class));
+			bufferSalida.println(Cifrado.cifrar(gson.toJson(es.nextLine()), pass));
 		}
 	}
 	
 	static boolean dibujarTablero(BufferedReader entrada) throws IOException {
 		Gson gson = new Gson();
-		String linea = gson.fromJson(entrada.readLine(), String.class);
+		String salida = Cifrado.desencriptar(entrada.readLine(), pass);
+		String linea = gson.fromJson(salida, String.class);
 		if(linea.contains("v")) {
 			System.out.println("Has ganado!");
 		}else if (linea.contains("f")){