RTP: listo obtener parámetros
Merge branch 'master' of https://github.com/jjamardo/aed3_tp3

Conflicts:
	informe/ej5/ej5.tex