Paper: ignoring paper/semmul_group1.tdo in git
Merge branch 'master' of github.com:nicolas-fricke/semmul2013-group1