mon commit
Merge branch 'master' of https://github.com/fabienpinel/miniprojetmd

Conflicts:
	src/partie2/Test.java