Merge pull request #25 from mikelehen/master

Note about ^ for windows command-line users and a typo fix.

Author: Matthew McCullough

branching/index.html

@@ -664,6 +664,9 @@ <h2>
       front of the branch that we don't want to see.  For instance, if we want
       to see the commits that are in the 'erlang' branch that are not in the
       'master' branch, we can do <code>erlang ^master</code>, or vice versa.
+      Note that the Windows command-line treats <code>^</code> as a special
+      character, in which case you'll need to surround <code>^master</code>
+      in quotes.
     </p>
 
 <pre>

remotes/index.html

@@ -94,7 +94,7 @@ <h4>
     </h4>
 
     <p>If you want to share a locally created repository, or you want to take
-    contributions from someone elses repository - if you want to interact in
+    contributions from someone else's repository - if you want to interact in
     any way with a new repository, it's generally easiest to add it as a remote.
     You do that by running <code>git remote add [alias] [url]</code>.  That
     adds <code>[url]</code> under a local remote named <code>[alias]</code>.</p>