Preliminary version of merging lecture

README.md

merging/Makefile

merging/beamerthemelumc.sty

merging/gen2phen_logo.eps

merging/images/branches.eps

merging/images/branches.png

merging/images/commit.eps

merging/images/commit.png

merging/images/example-branched.eps

merging/images/example-branched.png

merging/images/example-committed.eps

merging/images/example-committed.png

merging/images/example-hue-ahead.eps

merging/images/example-hue-ahead.png

merging/images/example-merged-ff.eps

merging/images/example-merged-ff.png

merging/images/example-merged.eps

merging/images/example-merged.png

merging/images/example.eps

merging/images/example.png