Changed the note issue to radio buttons and much more
Fixed conflicts
Merge branch 'master' of https://github.com/saylorp/CollabDesk

Conflicts:
	backend.js