modif conflit
Merge branch 'master' of https://github.com/gnut3ll4/test

Conflicts:
	src/testgit/Main.java