ya termine historial
Merge remote-tracking branch 'origin/master'

Conflicts:
	pmm_is2/apps/des/urls.py
	pmm_is2/apps/des/views.py
	pmm_is2/templates/des/lista_item.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	pmm_is2/apps/des/models.py
merge a mano para que funcione todo