modifs test
retest
Merge https://github.com/nicolasroger17/isepldc2014
firstcommit william
Merge https://github.com/nicolasroger17/isepldc2014
commitsmarcon
Modif
testOdt
Create creation_fichier

ceci est toujours un essai
test
ok
Delete [OS] - 20140404.odt
ajout fichier test
ok
ok
solve conflict
ok2
ceci est un commentaire
Merge https://github.com/nicolasroger17/isepldc2014
push john.monroche/cours1.txt