and so on
Merge branch 'master' of https://github.com/gnut3ll4/test into branche2

Conflicts:
	src/testgit/Main.java
modif branche2
encore modif
Merge branch 'branche2'

Conflicts:
	src/testgit/Main.java