Initial commit
creation de salut.txt
Changement test
Modif branch test
rajout test branch
Modif 1
Rajout d'une fonction
Merge branch 'master' of http://github.com/julestruong/test

Conflicts:
	salut.txt
Debut debug1 1
debug1 2
jeudi aprem
Merge branch 'master' of http://github.com/julestruong/grit

Conflicts:
	README.md