Novice-level lesson on branching in Git

Adding a lesson on branching for novice git users. Kept it as simple as could be, introducing the basic branching commands only. I am on the fence about how to resolve the lesson so I would love to have feedback on the following-

**Update 5/1: Upon discussing the options went with teaching a PR on GitHub proper for the resolution to the lesson.** 

*Resolving the lesson:*
In line 155, I introduce merging. This will be problematic in the command line with the fast-forward vs. regular merge issue. To address this there are a few options.
* **Pull request-** If we introduce a pull request on GitHub, we can show them `git log --oneline --graph` so they can have a nice visual at the end showing their history in the command line. I personally think this is the best option. 
* **Explaining fast-forward vs. regular merge-** A run for the hills option, imho, it might be a little much to throw on them at this point.
* **Have them commit again to the master before merging-** A run for the mountains approach, they add a dummy commit in their workflow to retain branching history.

Any feedback on the rest of the lesson is welcome, tried to keep it consistent with Greg's lessons using the Monster Mash story line.
On Sat, Jun 28, 2014 at 04:59:48AM -0700, Pauline Barmby wrote:
> > @@ -21,6 +21,7 @@ can and should be stored in a version control system.
> >  2.  [A Better Kind of Backup](01-backup.html)
> >  3.  [Collaborating](02-collab.html)
> >  4.  [Conflicts](03-conflict.html)
> > -5.  [Open Science](04-open.html)
> > +5.  [Branch-Out](04-branch-out.html)
> > +6.  [Open Science](05-open.html)
> 
> Agreed with branching after open science; people are pretty fried by the end of conflicts.

Sorry to came later on this. I want to ask to keep branch before "open science"
because this make more sense for our offline lessons.

I agree that students need a break after the solving conflicts and so address
this issue I'm +1 to add a note/recommendation at `novice/teaching/03-git.md`
and another one at `novice/git/00-intro.md`.