Almost there
Merge branch 'master' of https://github.com/Germinadora/smarthaus