Una gilada
Merge branch 'master' of https://github.com/LeandroLovisolo/TdC-TP2
Estúpido pdf no versionable.
Merge branch 'master' of https://github.com/LeandroLovisolo/TdC-TP2

Conflicts:
	informe.pdf
Agregada una referencia.