Update paper
Merge branch 'master' of https://github.com/EleanorTR/s-o-s

Conflicts:
	docs/latex/csp.tex