Initial
Merge branch 'master' of https://github.com/slannez/MyHome

Conflicts:
	.gitignore