last changes
more last changes

Merge branch 'master' of https://github.com/nachalca/mnfb_yearly

Conflicts:
	report/ksu_paper.tex