todos
Merge branch 'master' of github.com:MartinFaartoft/similarity-filters

Conflicts:
	report/presentation.tex