Test branches
testBranch
.
Test merge with conflict
Test
Test gitignore
add gitignore
Test remote
test remote voisin
modifs