cocorico
logique
wazaiiiiiii !!!!!
Merge branch 'master' of http://github.com/14roiron/smartgrid
Conflicts:
	main.py
Merge branch 'master' of http://github.com/14roiron/smartgrid
coucou
Merge branch 'master' of http://github.com/14roiron/smartgrid

Conflicts:
	Ville.py
	main.py