checkpoint
cleanup
Merge branch 'master' of github.com:zot/Leisure

Conflicts:
	lib/browser.js
	lib/browser.js.tmp
	package.json
	www/bootLeisure.js
starting on collaboration stuff