git/basics.md: several changes
git/branching: new branching slides