agregar todo
Merge branch 'master' of github.com:Grupo-Ughelli-Lisnichuk-IS2/PMS

Conflicts:
	PMS/__init__.pyc
	PMS/settings.py
	PMS/settings.pyc
	manage.py
	principal/__init__.pyc
	principal/models.pyc
readme