merge two diverged contribution docs
Merge pull request #1300 from asmacdo/contribution-docs-merge

merge two diverged contribution docs