modification classe Zone
Merge origin/master

Conflicts:
	src/tp_pconc_meteo/CapteurTemperature.java
Merge origin/master

Conflicts:
	src/tp_pconc_meteo/CapteurTemperature.java