Cha cha cha changes
Merge branch 'master' of https://github.com/tkfx/IOTconf

Conflicts:
	index.html