Rapport
...
Merge branch 'master' of https://github.com/kasper0406/AlgEng

Conflicts:
	rapport2/benchmarks.tex