- Branche de test
Merge remote-tracking branch 'origin/master' into TestBranche

Conflicts:
	ProjetConception/src/Test.java
- k = deltaE
- Movering average