Hack Git

Branches!

FF Merge

Basic Merge

Rebase