UI work
Merge branch 'master' of https://github.com/tk-kowal/ServingUpTTT

Conflicts:
	public/index.html