nn
Merge branch 'master' of https://github.com/mariaiemoli/progetto.git

Conflicts:
	bifurcation/matrici.m