up
Merge branch 'master' of https://github.com/macmanes/trimming_paper

Conflicts:
	black.mk
	trim.mk