Commit 4.mai
Merge branch 'master' of https://github.com/Ingis/Master_thesis

Conflicts:
	Master_thesis_Inge_Nikolai_Torsvik.aux
	Master_thesis_Inge_Nikolai_Torsvik.log
	Master_thesis_Inge_Nikolai_Torsvik.pdf
	Master_thesis_Inge_Nikolai_Torsvik.tex
	Master_thesis_Inge_Nikolai_Torsvik.tex.backup
	Master_thesis_Inge_Nikolai_Torsvik.toc