Final version of short paper
Merge branch 'master' of https://github.com/pinne/short_paper_funcprog

Conflicts:
	final/func_oop_testing.bib