Transatlantico -> intercontinental.
Merge branch 'master' of github.com:Fixman/redes-tp2

Conflicts:
	informe/informe.pdf
	informe/resultados.tex
Merge branch 'master' of github.com:Fixman/redes-tp2

Conflicts:
	informe/resultados.tex
Squashing interconetinental branch.