fixed problem with TypeWright displaying conflicting edits in wrong order
Merge branch 'master' of https://github.com/collex/collex