Last few changes to git I class
Draft of branching and merging slides