Merge remote-tracking branch 'origin/master'

src/main/java/com/carpooling/carpoolingaoraha/entidades/Reserva.java

@@ -19,7 +19,8 @@ public class Reserva {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private int idReserva;
-    @Transient
+    @ManyToOne
+    @JoinColumn(name = "conductor_id")
     private Usuario conductor;
     @Transient
     private ArrayList<String> pasajeros;