added readme
modif readme
modif readme
modif readme
modif readme
modif readme
modif readme
motif encoreencore
Merge branch 'master' of masterid:/home_local/git/repository/sgap
Merge branch 'master' of masterid:/home_local/git/repository/sgap
Merge branch 'master' of masterid:/home_local/git/repository/sgap
modif readme
Merge branch 'master' of masterid:/home_local/git/repository/sgap
motif testencore
Merge branch 'master' of masterid:/home_local/git/repository/sgap
modif readme
Merge branch 'master' of masterid:/home_local/git/repository/sgap
modif readme
test conflit
conflit resolu