MAJOR: Implement conflict handling based on machine name (last resort after vector clock and timestamp comparison); Discovered another bug with the last common DBV determination
Merge pull request #5 from fabrice-rossi/master

MINOR: New output formats for the log command
MINOR: Merge Fabrice's LogCommand format fix
MINOR: Create TODO.md
MINOR: Update README.md, link to TODO.md
MINOR: Remove next steps text file