bla
bla.
bli.
Merge branch 'master' of https://github.com/vincent-botbol/Ocabug

Conflicts:
	rapport/rapport.pdf
blu.