rapport
Merge branch 'master' of ssh://github.com/Cadynum/kandidat

Conflicts:
	mittpresentation/presentation.pdf
Merge branch 'master' of ssh://github.com/Cadynum/kandidat

Conflicts:
	mittpresentation/presentation.pdf