ui changes
Merge branch 'master' of https://github.com/ariemtech/piathome

Conflicts:
	dummy/black.html
	server.js
	views/index.html
Merge branch 'master' of https://github.com/ariemtech/piathome