more testing necessary
Merge branch 'master' of github.com:Zucka/SmartHouse