Updated report
Merge branch 'master' of https://github.com/alexlongne/parpetro

Conflicts:
	report/final_report_till_long.tex