alivetimer
starting test client
Merge branch 'master' of https://github.com/jdalt/nodePlay

Conflicts:
	js/main.js
error catching, test client
Merge branch 'master' of https://github.com/jdalt/nodePlay