Include the academic competition as well.
Merge branch 'master' of github.com:majdal/modex