oh lord have mercy
Merge branch 'master' of github.com:trygvba/EiT-prosjekt

Conflicts:
	FEM/IncorporateDirichletBoundaryV2.m
	FEM/simulation4.m
	FEM/simulation4.m~