Merge branch 'patch-12' into 'master'

Change a bit the wording in the Merge definition.

Change a bit the wording in the **Merge** definition.

See merge request !43

source/glossary/index.html.md

@@ -259,7 +259,7 @@ A free distributed version control system like Git. Think of it as a competitor
 ### Merge
-Takes changes from one branch, and applies them to into another.
+Takes changes from one branch, and applies them into another branch.
 ### Meteor