index
Delete index.html~
jai fait un nouveau p
https://github.com/testDiscreteTrading/testTeam.git
Merge branch 'julientest'

Conflicts:
	index.html
test par moi julien
jespere que sa fonctionne
Merge branch 'master' of https://github.com/testDiscreteTrading/testTeam
sa devrais fonctionenr jimmage
je change dans ma branch
sa fonctionnerais
sdfsd
Delete index.html~

cxzc
delete index~
add
lalalalalalallala
Merge branch 'master' of https://github.com/testDiscreteTrading/testTeam
Merge branch 'master' of https://github.com/testDiscreteTrading/testTeam
Test Principal
Merge branch 'master' of https://github.com/testDiscreteTrading/testTeam