Added link to contribution guidelines to README.md
Merge branch 'master' into develop