Merge pull request #6 from OpenDTP/preprod

Preprod
Update README.md
Update README.md
resolve merge conflict