incorporate adapted, simpilifed git-branching diagram; #2