subir
Merge branch 'master' of github.com:joseignaciosg/SIA-TP2

Conflicts:
	net/testtrainerexp.m