Added a MergeDriver packaging
Revert "Added a MergeDriver packaging": bad idea :(

This reverts commit e0921e97e127dd006586efc843dfb16347ba8dd9.
Added a Makefile and a merge script.
Update README.md
Simplified the Makefile.
Update README.md
README: How does this works

Detailed how the merge driver works, the git interface, and the merge-tool idea
Merge pull request #1 from ThierryGoubier/master

pull Thierry's latest into my repo