updated report
Merge remote-tracking branch 'ric/master'

Conflicts:
	report/report.log
	report/report.pdf
	report/report.synctex.gz
	report/report.tex