asdf
Merge branch 'master' of https://github.com/dzim1/homegauge

Conflicts:
	npma-33test.html