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

Merged with master.