xxx
Merge remote-tracking branch 'origin/master'

Conflicts:
	producto_consumo.py
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
cambios
Merge remote-tracking branch 'origin/master'