exp1
gitignore actualizado
Merge branch 'master' of github.com:hernanbari/tps-algo-III

Conflicts:
	tp1/informe/tp.log