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

Conflicts:
	Data/maxdisp.mat
	Data/topdisp.mat