Merge pull request #4424 from SuriyaaKudoIsc/patch-1

Rename CONDUCT.md to CONDUCT.markdown
This commit is contained in:
Parker Moore
2016-02-01 10:39:04 -08:00