TestResults halfway commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	Rapport/Conclusion.tex