resta 1
Merge branch 'master' of https://github.com/gcastigl/MNA-1C

Conflicts:
	TP2/code/tdf2d.m