stuff
Merge branch 'master' of github.com:magnhalv/Infosikkerhet

Conflicts:
	Include/results.tex