merge
Merge branch 'master' of https://github.com/NathanRichard/Etude_SR04

Conflicts:
	rapport.pdf