arééquilibrage
maj ville
Merge branch 'master' of https://github.com/14roiron/smartgrid

Conflicts:
	Equipement/Stockage.py
ia
Merge branch 'master' of https://github.com/14roiron/smartgrid
Merge branch 'master' of https://github.com/14roiron/smartgrid
Merge branch 'master' of https://github.com/14roiron/smartgrid
Merge branch 'master' of https://github.com/14roiron/smartgrid
mod