Add contributing guidelines
Fix merge conflict
Add contributing guidelines
Fix conflicts
Merge pull request #17 from b130769/master

Add contributing guidelines