Add first file
Add first dir and second file
Move file_2
Add new line to file 2
Add new line to file 1
Merge branch 'Modif_file_2'