modifs test
retest
Merge https://github.com/nicolasroger17/isepldc2014
test
push john.monroche/cours1.txt
dossier personnel
Commit Eliot
Tu acceptes Roger
push john.monroche/cours1.txt
Merge https://github.com/nicolasroger17/isepldc2014
elbajo is smart
add all
julie add tp1.txt
Merge https://github.com/nicolasroger17/isepldc2014
cours1
Merge pull request #17 from elbajo/master

elbajo is (not) smart
Merge pull request #19 from eliotnumber2/master

Commit Eliot
Merge pull request #18 from john2512/master

accepte
cours1
commit Eliot