added more specs
more specs
fixed conflict
Merge branch 'master' of https://github.com/Mellumen/Bachelor-dokument

Conflicts:
	Sluttrapport/Referanser.bib