Paper: Correct values for p and r in chap 5
Merge branch 'master' of github.com:nicolas-fricke/semmul2013-group1

Conflicts:
	paper/semmul_group1.pdf