edit welcome
pull latest version and fix conflict
Merge branch 'master' of github.com:elan2wang/iHome