Ajout cici
Merge branch 'master' of https://github.com/freyn/test_4

Conflicts:
	coco.txt