figure caption
Merge branch 'origin/master'
small fixes
table
Merge branch 'origin/master'

Conflicts:
	report/4_results.tex
report final pdf