- Distributions poids
Merge remote-tracking branch 'origin/master'

Conflicts:
	ProjetConception/src/Recuit.java
	ProjetConception/src/Test.java