Doing a mege to tidy things up.
g branch master
Merge branch 'master' of https://github.com/mozillamonks/OfficeSharing

Conflicts:
	app.js