Fixed babysitter-like bug
Merge branch 'master' of https://github.com/Troupe/faye-live-demo

Conflicts:
	package.json