ryddet op i preamble
Merge remote-tracking branch 'upstream/master'
gemme foer pull
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
Merge remote-tracking branch 'upstream/master'

Conflicts:
	assignment_2/Rapport/main.pdf
	assignment_2/bin/Opgave2.class
alle retelser siden i gaar
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	assignment_2/Rapport/main.pdf
pngs
derp
derp
drp
Merge branch 'master' of https://github.com/skrogh/02102
fixed latex