Merge branch 'master' of https://github.com/padal/report

Conflicts:
padalreport.pdf
padalreport.synctex.gz