readcontrooler.py changed
Merge branch 'daemon' of http://github.com/geraldebberink/energy-meter into daemon