dunno
Merge branch 'master' of github.com:trygvba/EiT-prosjekt

Conflicts:
	FEM/IncorporateDirichletBoundary.m
	FEM/IncorporateDirichletBoundary.m~
Merge branch 'master' of github.com:trygvba/EiT-prosjekt

Conflicts:
	FEM/IncorporateDirichletBoundary.m