merging github defaults.
Merge branch 'master' of github.com:odontomachus/home-automation