test merge
Merge branch 'master' of https://github.com/jphome/home_smart

Conflicts:
	README.md
  test merge
Merge branch 'master' of https://github.com/jphome/home_smart

Conflicts:
	README.md