basic collaboration (no persistence)
Merge branch 'master' of git@github.com:zot/Leisure.git

Conflicts:
	lib/fancyOrg.map
	www/fancyOrg.map