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

Conflicts:
	Ville.py
	main.py