disambiguation
Merge branch 'cg2014-tutorial' of https://github.com/metaborg/doc into cg2014-tutorial