Merge remote-tracking branch 'origin/branching'

README.md

branching/Makefile

branching/beamerthemelumc.sty

branching/branching.tex

branching/gen2phen_logo.eps

branching/images/branches.eps

branching/images/branches.png

branching/images/commit.eps

branching/images/commit.png

branching/images/example-branched.eps

branching/images/example-branched.png

branching/images/example-committed.eps

branching/images/example-committed.png

branching/images/example-merged-ff.eps

branching/images/example-merged-ff.png

branching/images/example-merged.eps

branching/images/example-merged.png

branching/images/example.eps

branching/images/example.png

branching/images/head.eps