update
Merge branch 'master' of https://github.com/leopard891/myhomeapp

Conflicts:
	Readme.txt