Start of work on collaborative editting tool.
Got edit working locally.
Added basic python server.
Fixed patching algorithm.
undid previous commit.
Implemented Server
Added state machine still has bugs.
collabEdit working on own server
Started adding collab_edit to main server.
Added collab edit into main server.
Integraded collabedit with new framework changes.
Removed .idea folder.
Removed extra scripts.
Code review changes.
Merge with divij's changes.
Finished collabedit and fixed up notes backbone code.
merge conflicts.
Code review changes.
Merge pull request #56 from jivid/jesse/collab_edit

Jesse/collab edit