cherry-pick; cleanup
cherry-pick; cleanup
bit more info about cherry-pick-ing
Merge branch 'master' of https://github.com/atmin/git-workflow

Conflicts:
	README.md
evolve
refto: A successful Git branching model
Add description for dcommiting local branches