intento de merge
Merge branch 'master' of https://github.com/alforro/SGP_Q03

Conflicts:
	.idea/workspace.xml
	SGP_Q03/SGP_Q03/settings.pyc
	SGP_Q03/proyectos/models.pyc
	SGP_Q03/roles_y_permisos/models.pyc
	SGP_Q03/usuarios/models.pyc