arrancandoel2
OMerge branch 'master' of https://github.com/cosa65/Algo3-Orga2

Conflicts:
	Dont Dead Open Inside/Parabrisas.h
	Dont Dead Open Inside/aux/Parabrisas.h
	Dont Dead Open Inside/aux/Parabrisas.h~
	Dont Dead Open Inside/aux/matriz.h
	Dont Dead Open Inside/matriz.h
	Dont Dead Open Inside/metnum.py
	Dont Dead Open Inside/scripts/fabricate.py
	Dont Dead Open Inside/scripts/fabricate.pyc
	Dont Dead Open Inside/scripts/settings.py
	Dont Dead Open Inside/scripts/settings.pyc
	Dont Dead Open Inside/scripts/tptests.py
	Dont Dead Open Inside/scripts/tptests.pyc
	Dont Dead Open Inside/scripts/utils.py
	Dont Dead Open Inside/t.cpp
	Dont Dead Open Inside/t.cpp~
	Dont Dead Open Inside/tests/test1.expected
	Dont Dead Open Inside/tests/test1.expected~
	Dont Dead Open Inside/tests/test1.in
	Dont Dead Open Inside/tests/test1.out
	Dont Dead Open Inside/tests/test1.out~
	Dont Dead Open Inside/tests/test2.expected
	Dont Dead Open Inside/tests/test2.in
	Dont Dead Open Inside/tests/test2.in~
	Dont Dead Open Inside/tests/test2.out
	Dont Dead Open Inside/tests/test3.expected
	Dont Dead Open Inside/tests/test3.in
	Dont Dead Open Inside/tests/test4.expected
	Dont Dead Open Inside/tests/test4.in
	Dont Dead Open Inside/tests/test4.out
	Dont Dead Open Inside/tests/test4.out~
	Dont Dead Open Inside/tests/tn.out~
	Dont Dead Open Inside/tools/graphinst.m
	Dont Dead Open Inside/tools/graphsol.py
	Dont Dead Open Inside/tools/judge.py
	Dont Dead Open Inside/tools/test1.in~
	Dont Dead Open Inside/tools/tomo.in~
	Latex/Informe.tex
	Latex/basico.pdf
	Latex/caratula.sty
	Latex/logo_uba.jpg
	RTP1/Código-src/aux/Parabrisas.cpp
	RTP1/Código-src/aux/Parabrisas.h~
	RTP1/Código-src/recu.cpp~
	RTP1/Código-src/t.cpp
	RTP1/Informe-src/logo_uba.jpg
	RTP1/Informe-src/macros.tex
	RTP1/Tests/test1 (3rd copy).in~
	TP1/Código-src/aux/Parabrisas.h~
	TP1/Código-src/aux/matriz.cpp
	TP1/Código-src/aux/matriz.h~
	TP1/Informe-src/logo_uba.jpg
	TP1/Informe-src/macros.tex
	TP1/deprofes/enunciado/tp1.pdf
	TP1/deprofes/enunciado/tp1.tex
	TP1/deprofes/metnum.py
	TP1/deprofes/presentacion/presentacion.pdf
	TP1/deprofes/scripts/fabricate.py
	TP1/deprofes/scripts/fabricate.pyc
	TP1/deprofes/scripts/settings.py
	TP1/deprofes/scripts/settings.pyc
	TP1/deprofes/scripts/tptests.py
	TP1/deprofes/scripts/tptests.pyc
	TP1/deprofes/scripts/utils.py
	TP1/deprofes/tests/test1.expected
	TP1/deprofes/tests/test1.expected~
	TP1/deprofes/tests/test1.out
	TP1/deprofes/tests/test1.out~
	TP1/deprofes/tests/test2.expected
	TP1/deprofes/tests/test2.in
	TP1/deprofes/tests/test2.in~
	TP1/deprofes/tests/test2.out
	TP1/deprofes/tests/test3.expected
	TP1/deprofes/tests/test3.in
	TP1/deprofes/tests/test3.out
	TP1/deprofes/tests/test4.expected
	TP1/deprofes/tests/test4.in
	TP1/deprofes/tests/test4.out
	TP1/deprofes/tests/test4.out~
	TP1/deprofes/tests/tn.out~
	TP1/deprofes/tools/graphinst.m
	TP1/deprofes/tools/graphsol.py
	TP1/deprofes/tools/judge.py
	TP1/deprofes/tools/test1.in~
	TP1/deprofes/tools/tomo.in~
	Tp1/Dont Dead Open Inside/Parabrisas.h
	Tp1/Dont Dead Open Inside/README
	Tp1/Dont Dead Open Inside/aux/Parabrisas.h
	Tp1/Dont Dead Open Inside/aux/Parabrisas.h~
	Tp1/Dont Dead Open Inside/aux/matriz.h
	Tp1/Dont Dead Open Inside/aux/matriz.h~
	Tp1/Dont Dead Open Inside/aux/matrizB.h
	Tp1/Dont Dead Open Inside/averr.txt
	Tp1/Dont Dead Open Inside/averr.txt~
	Tp1/Dont Dead Open Inside/comandos.txt~
	Tp1/Dont Dead Open Inside/main
	Tp1/Dont Dead Open Inside/matriz.h
	Tp1/Dont Dead Open Inside/metnum.py
	Tp1/Dont Dead Open Inside/scripts/__init__.pyc
	Tp1/Dont Dead Open Inside/scripts/fabricate.py
	Tp1/Dont Dead Open Inside/scripts/fabricate.pyc
	Tp1/Dont Dead Open Inside/scripts/settings.py
	Tp1/Dont Dead Open Inside/scripts/settings.pyc
	Tp1/Dont Dead Open Inside/scripts/tptests.py
	Tp1/Dont Dead Open Inside/scripts/tptests.pyc
	Tp1/Dont Dead Open Inside/scripts/utils.py
	Tp1/Dont Dead Open Inside/scripts/utils.pyc
	Tp1/Dont Dead Open Inside/t.cpp
	Tp1/Dont Dead Open Inside/t.cpp~
	Tp1/Dont Dead Open Inside/test tomo.in
	Tp1/Dont Dead Open Inside/tests/test1.expected
	Tp1/Dont Dead Open Inside/tests/test1.expected~
	Tp1/Dont Dead Open Inside/tests/test1.in
	Tp1/Dont Dead Open Inside/tests/test1.out
	Tp1/Dont Dead Open Inside/tests/test1.out~
	Tp1/Dont Dead Open Inside/tests/test2.expected
	Tp1/Dont Dead Open Inside/tests/test2.in
	Tp1/Dont Dead Open Inside/tests/test2.in~
	Tp1/Dont Dead Open Inside/tests/test2.out
	Tp1/Dont Dead Open Inside/tests/test3.expected
	Tp1/Dont Dead Open Inside/tests/test3.in
	Tp1/Dont Dead Open Inside/tests/test4.expected
	Tp1/Dont Dead Open Inside/tests/test4.in
	Tp1/Dont Dead Open Inside/tests/test4.out
	Tp1/Dont Dead Open Inside/tests/test4.out~
	Tp1/Dont Dead Open Inside/tests/tn.out~
	Tp1/Dont Dead Open Inside/tn.in~
	Tp1/Dont Dead Open Inside/tomo.in
	Tp1/Dont Dead Open Inside/tomo.in~
	Tp1/Dont Dead Open Inside/tomo.out
	Tp1/Dont Dead Open Inside/tools/graphinst.m
	Tp1/Dont Dead Open Inside/tools/graphsol.py
	Tp1/Dont Dead Open Inside/tools/judge.py
	Tp1/Dont Dead Open Inside/tools/test1.in
	Tp1/Dont Dead Open Inside/tools/test1.in~
	Tp1/Dont Dead Open Inside/tools/test1.out
	Tp1/Dont Dead Open Inside/tools/tomo.in~
	Tp1/Latex/Caratula.tex~
	Tp1/Latex/Informe.aux
	Tp1/Latex/Informe.log
	Tp1/Latex/Informe.out
	Tp1/Latex/Informe.pdf
	Tp1/Latex/Informe.tex
	Tp1/Latex/basico.pdf
	Tp1/Latex/basico.synctex.gz
	Tp1/Latex/caratula.sty
	Tp1/Latex/logo_dc.jpg
	Tp1/Latex/logo_uba.jpg
	Tp1/tp1-mn/Tuvieja/t.cpp
	Tp1/tp1-mn/docs/enunciado/tp1.pdf
	Tp1/tp1-mn/docs/enunciado/tp1.tex
	Tp1/tp1-mn/docs/presentacion/presentacion.pdf
	tp1-mn/docs/enunciado/tp1.pdf
	tp1-mn/docs/enunciado/tp1.tex
	tp1-mn/docs/presentacion/presentacion.pdf
cosas