Measurements
Report updates
Merge branch 'master' of https://github.com/kasper0406/AlgEng

Conflicts:
	rapport1/benchmarks.tex