ch pdf
Merge branch 'master' of github.com:weierstrass/p

Conflicts:
	article/main.pdf
pdf