fixed js and html
Merge

Conflicts:
	public/index.html