aa
Merge branch 'FrontEnd-Editor' of https://github.com/trea-uy/django-survey.git into FrontEnd-Editor
u
Merge branch 'FrontEnd-Editor' into BackEnd

Conflicts:
	TreaProject/TreaProject/urls.py
	TreaProject/dynamicForms/login.py
	TreaProject/dynamicForms/urls.py
Merge branch 'BackEnd' of https://github.com/trea-uy/django-survey.git
into BackEnd

Conflicts:
	TreaProject/dynamicForms/logout.py
Correcciones en el login logout
Merge branch 'BackEnd' of https://github.com/trea-uy/django-survey into
BackEnd

Conflicts:
	TreaProject/dynamicForms/login.py
	TreaProject/dynamicForms/logout.py
cambios-menores
login "andando"
login
wq
Merge branch 'BackEnd' of https://github.com/trea-uy/django-survey into
BackEnd

Conflicts:
	TreaProject/dynamicForms/login.py
	TreaProject/dynamicForms/templates/login.html
Faltaba-un-imort
asd
Agregue-login-url
cambios varios
Agregue-url-de-logout
Merge branch 'FrontEnd-Editor' of https://github.com/trea-uy/django-survey.git into FrontEnd-Editor
Agregue-la-url-en-el-href-del-link-logout
sddsvdsv