Update README.md
Merge branch 'devel'
merge conflict