basura
Merge branch 'master' of git@github.com:fdmazzone/Ecuaciones_Diferenciales.git

Conflicts:
	sage-plots-for-uni5.tex/plot-0.eps
	sage-plots-for-uni5.tex/plot-0.pdf
	sage-plots-for-uni5.tex/plot-1.eps
	sage-plots-for-uni5.tex/plot-1.pdf
	sage-plots-for-uni5.tex/plot-2.eps
	sage-plots-for-uni5.tex/plot-2.pdf
	sage-plots-for-uni5.tex/plot-3.eps
	sage-plots-for-uni5.tex/plot-3.pdf
	uni5.pdf
2014 06 06 19:15