Merge pull request #3733 from optikfluffel/code-of-conduct

Add links to Code of Conduct

Author: josevalim

CONTRIBUTING.md

@@ -2,6 +2,7 @@
 
 Please take a moment to review this document in order to make the contribution
 process easy and effective for everyone involved!
+Also make sure you follow our [CODE_OF_CONDUCT.md](CODE_OF_CONDUCT.md), so everyone involved in this project feels safe and welcomed.
 
 ## Using the issue tracker
 

README.md

@@ -39,7 +39,7 @@ cd ../elixir && make docs
 
 ## Contributing
 
-We appreciate any contribution to Elixir, so check out our [CONTRIBUTING.md](CONTRIBUTING.md) guide for more information. We usually keep a list of features and bugs [in the issue tracker][2].
+We appreciate any contribution to Elixir, that's following our [CODE_OF_CONDUCT.md](CODE_OF_CONDUCT.md), so check out our [CONTRIBUTING.md](CONTRIBUTING.md) guide for more information. We usually keep a list of features and bugs [in the issue tracker][2].
 
 ## Important links