lolmerge?
Merge branch 'master' of https://github.com/bearcott/quicktutor