stupid lineendings
function headers
tilfjet fil
Merge remote-tracking branch 'upstream/master'

Conflicts:
	assignment_2/Rapport/main.pdf
	assignment_2/Rapport/main.synctex.gz
	assignment_2/src/Opgave2.java