http://scottchacon.com/2011/08/31/github-flow.html