first commit
	modified:   html/index.html
Merge branch 'master' of https://github.com/esterhuizen/home_automation

I had to.