update
Merge branch 'master' of github.com:buren/git-story into extend_git

Merge with master.
Merge pull request #37 from buren/extend_git

Extend git