Merge branch 'dev' of https://github.com/leacoco/ops-puppet into dev
[dev] change the Readme file
[leacoco] change made by Readme file on leacoco
merge conflict chenged