Better document
Deleted README.txt
Conflict resolution
Merge branch 'master' of https://github.com/jbgastineau/DDB

Conflicts:
	README