merge [nlasso]
Merge branch 'master' of http://github.com/nlasso/so

Conflicts:
	entregable/entregable/informe/ejercicio10.tex
	entregable/entregable/informe/mainTP1.aux
	entregable/entregable/informe/mainTP1.log
	entregable/entregable/informe/mainTP1.pdf
	entregable/entregable/informe/mainTP1.toc
agregadas algunas cosas ejercicio 5