fix BMB paper link
Merge branch 'master' of misterioso.homelinux.net:~/git/website

Conflicts:
	cv/cv.pdf
	templates/papers.json
	web/pdf/eriksson-cv.pdf
Merge branch 'master' of https://github.com/nkeriks/website
updating two papers