updated main
update for master
Merge branch 'master' of http://github.com/14roiron/smartgrid
Conflicts:
	main.py
Merge branch 'master' of http://github.com/14roiron/smartgrid

Conflicts:
	main.py
petit lapin rose
Merge branch 'master' of http://github.com/14roiron/smartgrid