Add contribution guidelines
Add clause about merging master into development
Merge pull request #738 from theGoodEvil/contributing

Contribution Guidelines