Modif line 1 (life)
Modif line 1 (this)
Merge branch 'dev_fonction_test_2'

Conflicts:
	File_1.txt
Add .gitignore