stuff
Merge branch 'geo' of https://github.com/maxwellv/git-branching into geo