even more writing
Merge remote-tracking branch 'origin/master'

Conflicts:
	Rapport/Analysis.tex

fixing some conlicts