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

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