git-lessons, 3 and 4
Merge branch 'master' of https://github.com/KennF/Circus