ouioui
euh...
Merge branch 'master' of https://github.com/14roiron/smartgrid

Conflicts:
	Ville.py
	resultats/graphNum0Difference.png
	resultats/graphNum0DifferenceC.png
	resultats/graphNum0IndivConsigneConso.png
	resultats/graphNum0IndivConsigneConsoDiff.png
	resultats/graphNum0IndivConsigneProd.png
	resultats/graphNum0IndivConsigneProdDiff.png
	resultats/graphNum0IndivConso.png
	resultats/graphNum0IndivProd.png
	resultats/graphNum0SommeConso.png
	resultats/graphNum0SommeProd.png
	resultats/graphNum0UniConso.png
	resultats/graphNum0UniProd.png
on se tire !!