Merge remote-tracking branch 'origin/master'

Conflicts:
	Rapporten/Rapport.log
	Rapporten/Rapport.pdf
	Rapporten/Rapport.synctex.gz

Fuck U SØREN
tyu
Merge remote-tracking branch 'origin/master'

Conflicts:
	Rapporten/Rapport.aux
	Rapporten/Rapport.log
	Rapporten/Rapport.out
	Rapporten/Rapport.pdf
	Rapporten/Rapport.synctex.gz
	Rapporten/Rapport.toc
Merge branch 'master' of https://github.com/Haurum/P1

Conflicts:
	Rapporten/Rapport.aux
	Rapporten/Rapport.log
	Rapporten/Rapport.out
	Rapporten/Rapport.pdf
	Rapporten/Rapport.synctex.gz
	Rapporten/Rapport.toc