herman
hermanMerge branch 'master' of https://github.com/diedoman/domotica
kut dingMerge branch 'master' of https://github.com/diedoman/domotica

Conflicts:
	raspberrypi.h
leven kutdingen