Normas
commit
commit
Merge branch 'master' of https://github.com/mcarreiro/metodos
Tests stanford
resultados
informe
norma stanford
bal
Merge branch 'master' of https://github.com/mcarreiro/metodos

Conflicts:
	tp2-mn/informe/arp.pdf
	tp2-mn/src/tests/web-Stanford.in