broke slide clones in TODO file out into its own item, added to WINDOWS_NOTES.txt
starting on collaboration
Merge branch 'master' of github.com:zot/Leisure

Conflicts:
	package.json
trying to add attrhtml
Merge branch 'master' of https://github.com/zot/Leisure.git

Conflicts:
	lib/browser.js
	lib/browser.js.tmp
	www/leisureJS-.js
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
commit
Merge branch 'master' of git@github.com:zot/Leisure.git

Conflicts:
	lib/browser.js
	lib/browser.js.tmp
	www/bootLeisure.js
adding coffeescript def
working on image attribs
fixing image attrhtml
dragging images
basic collaboration (no persistence)
Merge branch 'master' of git@github.com:zot/Leisure.git

Conflicts:
	lib/fancyOrg.map
	www/fancyOrg.map
added server -p port paramater
fixed collaboration with local document uris
debugging connection to textcraft.org