dfsdfsdf
Merge branch 'master' of https://github.com/diedoman/domotica

Conflicts:
	sensor.cpp