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

Conflicts:
	bifurcation/darcy
	bifurcation/matrice.mm
	bifurcation/rhs.mm
	bifurcation/src/BC.cc
	bifurcation/src/BC.o
	bifurcation/src/DarcyFractured.cc
	bifurcation/vtk/RegionMesh.vtk
	bifurcation/vtk/cuttedElements.vtk
	bifurcation/vtk/fracturePressure0.vtk
	bifurcation/vtk/fracturePressure1.vtk
	bifurcation/vtk/fracturePressure2.vtk
	bifurcation/vtk/fractureVelocity0.vtk
	bifurcation/vtk/fractureVelocity1.vtk
	bifurcation/vtk/fractureVelocity2.vtk