Syng
Merge remote-tracking branch 'origin/master'

Conflicts:
	tp0/src/tp0/RangeSlider.java
Commit Vendredi MATIN