Merge branch 'master' into add-artoo

CONTRIBUTING.md

@@ -0,0 +1,33 @@
+# Contribution guide
+
+Welcome to your first contribution. :heart:
+
+#### Table Of Contents
+- [Code of Conduct](#code-of-conduct)
+- [Translation Guide](#translation-guide)
+
+## Code of Conduct
+If you want to contribute, you need to know a few things.
+
+[Code of conduct](CODE_OF_CONDUCT.md)
+
+## Translation Guide
+We have some rules for translation. If you make the first translation for your language, you must add your language list on `LANGUAGES.md`.
+
+#### Example
+
+`LANGUAGES.md`
+```markdown
+|Country | Translated Link |
+| --- | --- |
+| English | [English](../README.md) |
+| 🇮🇳 India | [Hindi](../translations/README.hi.md) |
+| 🇲🇲 Myanmar | [Myanmar Unicode](../translations/README.mm_unicode.md), Myanmar ZawGyi |
+```
+
+## TODO
+- [x] Fixed grammar for contribution Guide
+- [ ] Add more example and more guide
+
+
+Thanks! :heart:

LANGUAGES.md

@@ -0,0 +1,29 @@
+# Translation
+
+| Country | Translated Link |
+| --- | --- |
+| English | [English](README.md) |
+| 🇮🇳 India | [Hindi](translations/README.hi.md) |
+| 🇲🇲 Myanmar | [Myanmar Unicode](translations/README.mm_unicode.md) |
+| 🇮🇩 Indonesian | [Indonesian](translations/README.id.md) |
+| 🇫🇷 French | [French](translations/README.fr.md) |
+| 🇪🇸 Spain | [Spanish](translations/README.es.md) |
+| 🇳🇱 Dutch | [Dutch](translations/README.nl.md) |
+| 🇷🇺 Russian | [Russian](translations/README.ru.md) |
+| 🇯🇵 Japan | [Japanese](translations/README.ja.md) |
+| 🇻🇳 Vietnam | [Vietnamese](translations/README.vn.md) |
+| 🇵🇱 Poland | [Polish](translations/README.pl.md) |
+| 🇰🇷 South Korea, 🇰🇵 North Korea | [Korean](translations/README.ko.md) |
+| 🇩🇪 Germany | [German](translations/README.de.md) |
+| 🇨🇳 China | [Simplified Chinese](translations/README.chs.md), [Traditional Chinese](translations/README.cht.md) |
+| 🇬🇷 Greece | [Greek](translations/README.gr.md) |
+| العربية | [العربية](translations/README.ar.md) |
+| 🇺🇦 Ukraine | [Ukrainian](translations/README.ua.md) |
+| 🇵🇹 Portugal, 🇧🇷 Brazil | [Português/Brasil](translations/README.pt_br.md) |
+| 🇮🇹 Italy | [Italian](translations/README.it.md)
+| 🇹🇭 Thailand | [ภาษาไทย](translations/README.th.md) |
+| 🏴󠁥󠁳󠁧󠁡󠁿 Galicia | [Galician](translations/README.gl.md) |
+| 🇵🇰 Pakistan | [Urdu](translations/README.ur.md) |
+| :bangladesh: Bangladesh | [Bangla](translations/README.bn.md) |
+| :moldova: Moldova, :romania: Romania | [Romanian](translations/README.ro.md)|
+

LICENSE

@@ -1,6 +1,6 @@
-MIT License
+                         MIT License
 
-Copyright (c) 2016 - present Roshan Jossey
+           Copyright (c) 2016 - present Roshan Jossey
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,15 +1,17 @@
 [![Open Source Love](https://badges.frapsoft.com/os/v1/open-source.svg?v=103)](https://github.com/ellerbrock/open-source-badges/)
 [<img align="right" src="https://firstcontributions.herokuapp.com/badge.svg">](https://firstcontributions.herokuapp.com)
+[![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](https://opensource.org/licenses/MIT)
+
 
 # First Contributions
 
 It's hard. It's always hard the first time you do something. Especially when you are collaborating, making mistakes isn't a comfortable thing. But open source is all about collaboration & working together. We wanted to simplify the way new open-source contributors learn & contribute for the first time.
 
 Reading articles & watching tutorials can help, but what's better than actually doing the stuff without messing up anything? This project aims at providing guidance & simplifying the way rookies make their first contribution. Remember: the more relaxed you are, the better you learn. If you are looking to make your first contribution, just follow the simple steps below. We promise you, it will be fun.
 
-<img align="right" width="300" src="assets/fork.png" alt="fork this repository" />
+#### *Read this in [other languages](LANGUAGES.md)* 
 
-*Read this in other languages: [Myanmar Unicode](translations/README.mm_unicode.md),  [Indonesian](translations/README.id.md), [French](translations/README.fr.md), [Spanish](translations/README.es.md), [Dutch](translations/README.nl.md), [Hindi](translations/README.hi.md), [Russian](translations/README.ru.md), [Japanese](translations/README.ja.md), [Vietnamese](translations/README.vn.md), [Polish](translations/README.pl.md), [Korean](translations/README.ko.md), [German](translations/README.de.md), [Simplified Chinese](translations/README.chs.md), [Traditional Chinese](translations/README.cht.md), [Greek](translations/README.gr.md), [العربية](translations/README.ar.md), [Ukrainian](translations/README.ua.md), [Português/Brasil](translations/README.pt_br.md), [Italian](translations/README.it.md), [ภาษาไทย](translations/README.th.md) and [Galician](translations/README.gl.md).*
+<img align="right" width="300" src="assets/fork.png" alt="fork this repository" />
 
 If you don't have git on your machine, [ install it ]( https://help.github.com/articles/set-up-git/ ).
 
@@ -90,27 +92,27 @@ Now submit the pull request.
 
 Soon I'll be merging all your changes into the master branch of this project. You will get a notification email once the changes have been merged.
 
+## Where to go from here?
+
+Celebrate your contribution and share it with your friends and followers by going to [web app](https://roshanjossey.github.io/first-contributions/#social-share).
+
+You could join our slack team in case you need any help or have any questions. [Join slack team](https://firstcontributions.herokuapp.com).
+
+Now let's get you started with contributing to other projects. We've compiled a list of projects with easy issues you can get started on. Check out [the list of projects in web app](https://roshanjossey.github.io/first-contributions/#project-list).
+
 ### [ Additional material ](additional-material/additional-material.md)
 
-## Tutorials Using Other Tools
 
+## Tutorials Using Other Tools
 
 |<a href="github-desktop-tutorial.md"><img alt="GitHub Desktop" src="https://desktop.github.com/images/desktop-icon.svg" width="100"></a>|<a href="github-windows-vs2017-tutorial.md"><img alt="Visual Studio 2017" src="https://www.microsoft.com/net/images/vslogo.png" width="100"></a>|<a href="gitkraken-tutorial.md"><img alt="GitKraken" src="/assets/gk-icon.png" width="100"></a>|
 |---|---|---|
 |[GitHub Desktop](github-desktop-tutorial.md)|[Visual Studio 2017](github-windows-vs2017-tutorial.md)|[GitKraken](gitkraken-tutorial.md)|
 
-## Where to go from here?
-
-You could also join our slack team in case you need any help or have any questions. [Join slack team](https://firstcontributions.herokuapp.com)
+## Self-Promotion
 
-Here's some beginner level issues in popular repos that you can solve. Go ahead and go to those repos to learn more
+If you liked this project, star it on [GitHub](https://github.com/Roshanjossey/first-contributions).
+If you're feeling especially charitable, follow [Roshan](https://roshanjossey.github.io/) on
+[Twitter](https://twitter.com/sudo__bangbang) and
+[GitHub](https://github.com/roshanjossey).
 
-|[![exercism](https://avatars2.githubusercontent.com/u/5624255?v=3&s=100)](https://github.com/exercism/exercism.io/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+patch%22)|[![fun-retro](https://avatars3.githubusercontent.com/u/15913975?v=3&s=100)](https://github.com/funretro/distributed/issues?q=is%3Aopen+is%3Aissue+label%3Abeginner-friendly)|[<img width="100" src="https://cdn.worldvectorlogo.com/logos/react.svg">](https://github.com/facebook/react/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+bug%22)|[![habitat](https://avatars1.githubusercontent.com/u/18171698?v=3&s=100)](https://github.com/habitat-sh/habitat/issues?q=is%3Aopen+is%3Aissue+label%3AEasy)|[![scikit-learn](https://avatars0.githubusercontent.com/u/365630?v=3&s=100)](https://github.com/scikit-learn/scikit-learn/issues?q=is%3Aopen+is%3Aissue+label%3AEasy)|[<img width="100" src="https://camo.githubusercontent.com/0f302c808c8457f6460913e33aed3478124612c2/687474703a2f2f6c65696e696e67656e2e6f72672f696d672f6c65696e696e67656e2e6a7067">](https://github.com/technomancy/leiningen/issues?q=is%3Aopen+is%3Aissue+label%3ANewbie)|[<img width="100" src="https://images.plot.ly/plotly-documentation/thumbnail/numpy-logo.jpg">](https://github.com/numpy/numpy/issues?q=is%3Aopen+is%3Aissue+label%3A%22Easy+Fix%22)|[![elasticsearch](https://avatars2.githubusercontent.com/u/6764390?v=3&s=100)](https://github.com/elastic/elasticsearch/issues?q=is%3Aopen+is%3Aissue+label%3A%22low+hanging+fruit%22)|
-|---|---|---|---|---|---|---|---|
-|[exercism](https://github.com/exercism/exercism.io/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+patch%22)|[Fun Retros](https://github.com/funretro/distributed/issues?q=is%3Aopen+is%3Aissue+label%3Abeginner-friendly)|[react](https://github.com/facebook/react/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+bug%22)|[habitat](https://github.com/habitat-sh/habitat/issues?q=is%3Aopen+is%3Aissue+label%3AEasy)|[scikit-learn](https://github.com/scikit-learn/scikit-learn/issues?q=is%3Aopen+is%3Aissue+label%3AEasy)|[Leiningen](https://github.com/technomancy/leiningen/issues?q=is%3Aopen+is%3Aissue+label%3ANewbie)|[numpy](https://github.com/numpy/numpy/issues?q=is%3Aopen+is%3Aissue+label%3A%22Easy+Fix%22)|[elasticsearch](https://github.com/elastic/elasticsearch/issues?q=is%3Aopen+is%3Aissue+label%3A%22low+hanging+fruit%22)|
-|[![homebrew](https://avatars2.githubusercontent.com/u/1503512?v=3&s=100)](https://github.com/Homebrew/brew/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22)|[![rust](https://avatars1.githubusercontent.com/u/5430905?v=3&s=100)](https://github.com/rust-lang/rust/issues?q=is%3Aopen+is%3Aissue+label%3AE-easy)|[![vuejs](https://avatars1.githubusercontent.com/u/6128107?v=3&s=100)](https://github.com/vuejs/vue/issues?q=is%3Aopen+is%3Aissue+label%3A%22contribution+welcome%22)|[![Suave](https://avatars2.githubusercontent.com/u/5822862?v=3&s=100)](https://github.com/SuaveIO/suave/issues?q=is%3Aopen+is%3Aissue+label%3Ahardness-easy)|[![OpenRA](https://avatars3.githubusercontent.com/u/409046?v=3&s=100)](https://github.com/OpenRA/OpenRA/issues?q=is%3Aopen+is%3Aissue+label%3AEasy)|[![PowerShell](https://avatars0.githubusercontent.com/u/11524380?v=3&s=100)](https://github.com/powershell/powershell/issues?q=is%3Aopen+is%3Aissue+label%3AUp-for-Grabs)|[![coala](https://avatars2.githubusercontent.com/u/10620750?v=3&s=100)](https://github.com/coala/coala/issues?q=is%3Aopen+is%3Aissue+label%3Adifficulty%2Flow+label%3Adifficulty%2Fnewcomer)|[![moment](https://avatars2.githubusercontent.com/u/4129662?v=3&s=100)](https://github.com/moment/moment/issues?q=is%3Aopen+is%3Aissue+label%3AUp-For-Grabs)|
-|[homebrew](https://github.com/Homebrew/brew/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22)|[Rust](https://github.com/rust-lang/rust/issues?q=is%3Aopen+is%3Aissue+label%3AE-easy)|[vuejs](https://github.com/vuejs/vue/issues?q=is%3Aopen+is%3Aissue+label%3A%22contribution+welcome%22)|[Suave](https://github.com/SuaveIO/suave/issues?q=is%3Aopen+is%3Aissue+label%3Ahardness-easy)|[OpenRA](https://github.com/OpenRA/OpenRA/issues?q=is%3Aopen+is%3Aissue+label%3AEasy)|[PowerShell](https://github.com/powershell/powershell/issues?q=is%3Aopen+is%3Aissue+label%3AUp-for-Grabs)|[coala](https://github.com/coala/coala/issues?q=is%3Aopen+is%3Aissue+label%3Adifficulty%2Flow+label%3Adifficulty%2Fnewcomer)|[moment](https://github.com/moment/moment/issues?q=is%3Aopen+is%3Aissue+label%3AUp-For-Grabs)|
-|[![ava](https://avatars0.githubusercontent.com/u/8527916?v=3&s=100)](https://github.com/avajs/ava/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+for+beginner%22)|[![freeCodeCamp](https://avatars0.githubusercontent.com/u/9892522?v=3&s=100)](https://github.com/freeCodeCamp/freeCodeCamp/issues?q=is%3Aopen+is%3Aissue+label%3Afirst-timers-only)|[![webpack](https://avatars3.githubusercontent.com/u/2105791?v=3&s=100)](https://github.com/webpack/webpack/issues?q=is%3Aopen+is%3Aissue+label%3A%22D1%3A+Easy+%28Contrib.+Difficulty%29%22)|[![hoodie](https://avatars1.githubusercontent.com/u/1888826?v=3&s=100)](https://github.com/hoodiehq/hoodie/issues?q=is%3Aopen+is%3Aissue+label%3Afirst-timers-only)|[![pouchdb](https://avatars3.githubusercontent.com/u/3406112?v=3&s=100)](https://github.com/pouchdb/pouchdb/issues?q=is%3Aopen+is%3Aissue+label%3A%22first+timers+only%22)|[![neovim](https://avatars0.githubusercontent.com/u/6471485?v=3&s=100)](https://github.com/neovim/neovim/issues?q=is%3Aopen+is%3Aissue+label%3Aentry-level)|[![babel](https://avatars2.githubusercontent.com/u/9637642?v=3&s=100)](https://github.com/babel/babel/issues?q=is%3Aopen+is%3Aissue+label%3Abeginner-friendly) |[<img width="100" src="https://github.com/adobe/brackets/blob/gh-pages/images/brackets_128.png?raw=true">](https://github.com/adobe/brackets/labels/Starter%20bug)|
-|[ava](https://github.com/avajs/ava/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+for+beginner%22)|[freeCodeCamp](https://github.com/freeCodeCamp/freeCodeCamp/issues?q=is%3Aopen+is%3Aissue+label%3Afirst-timers-only)|[webpack](https://github.com/webpack/webpack/issues?q=is%3Aopen+is%3Aissue+label%3A%22D1%3A+Easy+%28Contrib.+Difficulty%29%22)|[hoodie](https://github.com/hoodiehq/hoodie/issues?q=is%3Aopen+is%3Aissue+label%3Afirst-timers-only)|[pouchdb](https://github.com/pouchdb/pouchdb/issues?q=is%3Aopen+is%3Aissue+label%3A%22first+timers+only%22)|[neovim](https://github.com/neovim/neovim/issues?q=is%3Aopen+is%3Aissue+label%3Aentry-level)|[babel](https://github.com/babel/babel/issues?q=is%3Aopen+is%3Aissue+label%3Abeginner-friendly) |[brackets](https://github.com/adobe/brackets/labels/Starter%20bug)|
-| [![Node.js](https://avatars1.githubusercontent.com/u/9950313?v=3&s=100)](https://github.com/nodejs/node/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+contribution%22)|[<img width="100" src="https://github.com/Semantic-Org/Semantic-UI-React/raw/master/docs/app/logo.png">](https://github.com/Semantic-Org/Semantic-UI-React/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+contribution%22)|
-| [Node.js](https://github.com/nodejs/node/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+contribution%22) |[Semantic-UI-React](https://github.com/Semantic-Org/Semantic-UI-React/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+contribution%22) |

additional-material/Useful-links-for-further-learning.md

@@ -0,0 +1,19 @@
+## Useful Links 
+
+This document is dedicated to all the blog posts, helpful sites, tips and tricks websites that makes our lives easier. That we refer to for all our needs, be it a beginner or an expert. This page should act as an index of all those useful links that would help everybody who is new in the open-source domain or someone who wants to learn more. 
+
+## The List 
+1. [Interactive tutorial to git](https;//try.github.io)
+2. [git - the simple guide](http://rogerdudler.github.io/git-guide/)
+3. [On undoing, fixing, or removing commits in git](http://sethrobertson.github.io/GitFixUm/fixup.html)
+4. [Git and GitHub tutorial translated to many languages](https://github.com/Roshanjossey/first-contributions)
+5. [Merge Conflicts](https://www.git-tower.com/learn/git/ebook/en/command-line/advanced-topics/merge-conflicts)
+6. [Resolving Merge Conflicts](https://githowto.com/resolving_conflicts)
+7. [Official Git cheat sheet in many languages](https://services.github.com/on-demand/resources/cheatsheets)
+8. [Git cheat sheet from Tower](https://www.git-tower.com/learn/cheat-sheets/git)
+9. [Common Git Problems](https://www.codementor.io/citizen428/git-tutorial-10-common-git-problems-and-how-to-fix-them-aajv0katd)
+10. [Git Rebase](https://blog.gitprime.com/git-rebase-an-illustrated-guide/)
+11. [Beginner's Guide to Rebasing and Squashing](https://github.com/servo/servo/wiki/Beginner%27s-guide-to-rebasing-and-squashing)
+
+
+Keep adding more links, that you find helpful.

additional-material/additional-material.md

@@ -8,4 +8,39 @@ This document provides information about how to delete a branch from your reposi
 
 ### [ Keeping your fork synced with the repository ](keeping-your-fork-synced-with-this-repository.md)
 This document provides information about how to keep your forked repository up-to-date with the base repository. This is important, as hopefully you and many others will contribute to the project.
-> Follow these steps if your fork doesn't have any changes in parent repository.
+> Follow these steps if your fork doesn't have any changes in parent repository.
+
+### [ Reverting a commit](reverting-a-commit.md)
+This document provides information about how to revert a commit on the remote repository. It comes in handy in case you when you need to undo a commit that has already been pushed to Github.
+> Take these steps if you want to reverse a commit.
+
+### [ Amending a commit](amending-a-commit.md)
+This document provides information about how to amend a commit on the remote repository. 
+> Use this when you need to adjust a commit you made.
+
+### [ Undo-ing a local commit ](undoing-a-commit.md)
+This document provides information about how to undo a commit on your local repository. This is what you need to do when you feel you've messed up your local repository and wish to reset the local repository.
+> Take these steps if you want to undo/reset a local commit.
+
+### [ Resolving Merge Conflicts ](resolving-merge-conflicts.md)
+This document provides information about how to resolve merge conflicts.
+> Take these steps to resolve the annoying merge conflicts.
+
+### [Removing a File](removing-a-file.md)
+This document provides information about how to remove a file from your local repository.
+> Follow these steps to learn how to remove a file prior to a commit
+
+### [ Moving a Commit to a different Branch ](moving-a-commit-to-a-different-branch.md)
+This document provides information about how to move a Commit to another Branch.
+> Take these steps to move a commit to another branch.
+
+### [ Configuring git ](configuring-git.md)
+This document provides information about how to configure user details and other options in git.
+> Use this to better control your git configurations.
+
+### [Useful Links](Useful-links-for-further-learning.md)
+This document is dedicated to all the blog posts, helpful sites, tips and tricks websites that makes our lives easier. That we refer to for all our needs, be it a beginner or an expert. This page should act as an index of all those useful links that would help everybody who is new in the open-source domain or someone who wants to learn more. 
+
+### [ Squashing Commits ](squashing-commits.md)
+This document provides information about how to squash commits with an interactive rebase.
+> Use this if you want to open a PR in an open source project and the reviewer asks you to squash every commit into one, with an informative commit message.