提交项目
Merge branch 'master' of https://github.com/LongQin/smarthome

Conflicts:
	.gitignore