3eme commit

Signed-off-by: Sebastien Larnicol <slarnicol@b-i.com>
Merge branch 'master' of https://github.com/slarnicol/repo2

Conflicts:
	faux.txt