added geo2
Merge branch 'geo' of https://github.com/natwebb/git-branching into geo