Haciendo Login
Merge branch 'Javier'

Conflicts:
	projectjobs/GUsers/urls.py