demo button now ajax
Merge branch 'master' of github.com:joewarren/jeffica

Conflicts:
	server.js
Merge branch 'master' of github.com:joewarren/jeffica

Conflicts:
	server.js