Actualizo las decisiones de diseño
Merge branch 'master' of https://github.com/juanpjacob/Varios

Conflicts:
	Corrector/decisiones.txt
Merge branch 'master' of https://github.com/juanpjacob/Varios

Mergeo