Add CONTRIBUTING.md
Add --no-ff
Merge branch 'doc' into develop