1er conflit
gitignore
3eme ca suffit ?
Merge branch 'master' into help

Conflicts:
	TEST1