diccionarios
Merge remote-tracking branch 'origin/master'

Conflicts:
	Oblig1/logica/procesador.py