Finalise formalisation
Merge branch 'master' of github.com:KDercksen/compot
Modify makefile and add references to main.tex