Merge branch 'master' into patch-1

Barlerer · Oct 28, 2018 · 8cb5132 · 8cb5132
2 parents 92eabdd + 1dc6389
commit 8cb5132
Show file tree

Hide file tree

Showing 7 changed files with 415 additions and 65 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -5,9 +5,7 @@ Welcome to your first contribution. :heart:
 #### Before Contributing:
 You need to run it locally on your desktop.
 
-In order to do that:
-
-Move to the desired location where package.json file is located
+In order to do that, move to the desired location where package.json file is located
 
 - Install npm(latest version) -
     npm is distributed with Node.js - which means that when you download Node.js,
@@ -22,7 +20,7 @@ Move to the desired location where package.json file is located
 
   `npm start`
 
-#### Table Of Contents
+### Table Of Contents
 - [Code of Conduct](#code-of-conduct)
 - [Translation Guide](#translation-guide)
 
@@ -34,7 +32,7 @@ If you want to contribute, you need to know a few things.
 ## Translation Guide
 We have some rules for translation. If you make the first translation for your language, you must add your language list on `Translations.md`.
 
-#### Example
+### Example
 
 `Translations.md`
 ```markdown

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -11,7 +11,7 @@ orientation.
 
 ## Our Standards
 
-Examples of behavior that contributes to creating a positive environment
+Examples of behaviour that contributes to creating a positive environment
 include:
 
 *   Using welcoming and inclusive language.