Working on document.tex (preparing for merge conflicts).
Merge branch 'master' of github.com:gui11aume/starcode
Manuscript ready for resubmission.