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

Conflicts:
	EiT-prosjekt/FEM/sim_Memsphere.m