reformat main.tex
Merge branch 'develop'