jquery update
Merge branch 'master' of https://github.com/airalex/rasptemp-sinatra

Conflicts:
	public/index.html