divya mad me do it.
Merge branch 'master' of https://github.com/saylorp/CollabDesk

Conflicts:
	index.html