comentario estandar
Merge branch 'master' of https://github.com/juandomingo/proyecto

Conflicts:
	templates/authFail.html.twig