manual merge of work_srozen
add report from work_srozen
Merge remote-tracking branch 'origin/exp_youri' into work_srozen

Conflicts:
	report/report.tex