paper
Merge branch 'master' of github.com:freuk/predictsim

Conflicts:
	pdf/paper/paper.tex
paper biblio