added text diff library dtl

Ignore-this: 171beb894a92b9711a7813620155cadc

darcs-hash:20140922225756-c21fe-d08aabfb859f47d882b76f93ff02954d52b4f30d
bug in the vclock merge algorithm

Ignore-this: d9cf815a1cbabf0c6593dca26378b913

The asynchronous version didn't make sense here

darcs-hash:20140922225959-c21fe-0ae4a1fd46f42dc6b3a41120980ef6dfed4261de
added text utility for doing 3 way merge

Ignore-this: 708d33daed01c84636e2acf78ff77638

darcs-hash:20140922230152-c21fe-2460d2eae371477a554f03d38ca1bf4dbd3228e1
added new concurrent string implementation

Ignore-this: c52973eb14c77a20e32484e8e1f533b5

Concurrent string combines a string data type, vector clock, and merge function to
make maintaining replicated string data easier.

It is able to determine when two strings were changed concurrent and perform  merge

darcs-hash:20140922230217-c21fe-fcddbc9797c1bb29b0f286c416a7d357d00943e9
code editor now using concurrent string

Ignore-this: 5d4cd6891e453b111028bd2ab76275bf

Instead of dealing with vector clocks directly. The code editor is now using concurrent
string implementation to maintain concurrent code editing and merging automatically.

darcs-hash:20140922230348-c21fe-0c2b6e068bef493a5763b548d260d2273cc05ead
removing duplicate merge call

Ignore-this: 2f70600d3b4a3c00b2d043876573e76a

darcs-hash:20140923003224-c21fe-cc511a5858e391ef7522ffbb5ee6cef189659a1a
removing duplicate merge call

Ignore-this: ca6145b0de63dab02dea9679e186eb1b

darcs-hash:20140923003318-c21fe-8724283a601497abe5ced145d542f1dd72d5a874