contributing guidelines
Merge branch 'feature1'