Funciona hasta aqui
Merge branch 'master' of https://github.com/DSI-ETSII-ULL/Equipo-DJES

Conflicts:
	README.md
	projectjobs/GUsers/features/index.feature
	projectjobs/GUsers/features/index.feature~
	projectjobs/GUsers/forms.py
	projectjobs/GUsers/forms.py~
	projectjobs/GUsers/models.py
	projectjobs/GUsers/models.py~
	projectjobs/GUsers/tests.py
	projectjobs/GUsers/tests.py~
	projectjobs/GUsers/views.py
	projectjobs/GUsers/views.py~
	projectjobs/db/database.db
	projectjobs/projectjobs/settings.py
	projectjobs/projectjobs/settings.py~
	projectjobs/projectjobs/urls.py
	projectjobs/projectjobs/urls.py~
	projectjobs/templates/GUsers/base.html
	projectjobs/templates/GUsers/listusuarios.html
	projectjobs/templates/GUsers/listusuarios.html~
	projectjobs/templates/GUsers/signup_form.html
	projectjobs/templates/GUsers/signup_form.html~
	projectjobs/templates/GUsers/userform.html
	projectjobs/templates/GUsers/userform.html~
	projectjobs/templates/ListaUsers.html
borrando backups de git