Added minor changes
resolve conflicts
Merge branch 'master' of https://github.com/Mellumen/Bachelor-dokument

Conflicts:
	Forprosjekt/Forprosjekt.tex