diff --git a/README.md b/README.md
index 83d0a57e27..b03670e14b 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,11 @@
 [![Build Status](https://travis-ci.com/wadobo/decide.svg?branch=master)](https://travis-ci.com/wadobo/decide) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/94a85eaa0e974c71af6899ea3b0d27e0)](https://www.codacy.com/app/Wadobo/decide?utm_source=github.com&utm_medium=referral&utm_content=wadobo/decide&utm_campaign=Badge_Grade) [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/94a85eaa0e974c71af6899ea3b0d27e0)](https://www.codacy.com/app/Wadobo/decide?utm_source=github.com&utm_medium=referral&utm_content=wadobo/decide&utm_campaign=Badge_Coverage)
 
+<<<<<<< HEAD
+
+UN CAMBIO!
+=======
+UN CAMBIO
+>>>>>>> 108181781834499f72c68c5ad22bebb67c530bde
 Plataforma voto electrónico educativa
 =====================================
 
diff --git a/decide/local_settings.example.py b/decide/local_settings.example.py
index 41db563a5a..4f42ef8abe 100644
--- a/decide/local_settings.example.py
+++ b/decide/local_settings.example.py
@@ -2,12 +2,6 @@
 
 # Modules in use, commented modules that you won't use
 MODULES = [
-    'authentication',
-    'base',
-    'booth',
-    'census',
-    'mixnet',
-    'postproc',
     'store',
     'visualizer',
     'voting',
@@ -25,7 +19,7 @@
     'voting': 'http://10.5.0.1:8000',
 }
 
-BASEURL = 'http://10.5.0.1:8000'
+BASEURL = 'localhost'
 
 DATABASES = {
     'default': {
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 032eed28e2..dfbc7bbc56 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-from python:alpine
+from python:3.7-alpine
 
 RUN apk add --no-cache git postgresql-dev gcc libc-dev
 RUN apk add --no-cache gcc g++ make libffi-dev python3-dev build-base
@@ -10,7 +10,7 @@ RUN pip install ipython
 
 WORKDIR /app
 
-RUN git clone https://github.com/wadobo/decide.git .
+RUN git clone https://github.com/ferlopmor1/decide.git .
 RUN pip install -r requirements.txt
 
 WORKDIR /app/decide
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 095583eb02..b61d61a1ce 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -4,11 +4,13 @@ services:
   db:
     restart: always
     container_name: decide_db
-    image: postgres:alpine
+    image: postgres:10.15-alpine
     volumes:
       - db:/var/lib/postgresql/data
     networks:
       - decide
+    environment:
+      - POSTGRES_PASSWORD= postgres
   web:
     restart: always
     container_name: decide_web
diff --git a/docker/docker-settings.py b/docker/docker-settings.py
index 01e643d936..850dc750a4 100644
--- a/docker/docker-settings.py
+++ b/docker/docker-settings.py
@@ -5,6 +5,7 @@
         'ENGINE': 'django.db.backends.postgresql',
         'NAME': 'postgres',
         'USER': 'postgres',
+        'PASSWORD':'postgres',
         'HOST': 'db',
         'PORT': 5432,
     }
diff --git a/requirements.txt b/requirements.txt
index d5860a1eb4..1acd8af5d3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ djangorestframework==3.7.7
 django-cors-headers==2.1.0
 requests==2.18.4
 django-filter==1.1.0
-psycopg2==2.7.4
+psycopg2-binary==2.7.4
 django-rest-swagger==2.2.0
 coverage==4.5.2
 django-nose==1.4.6