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

Conflicts:
	trim.mk
Merge branch 'master' of https://github.com/macmanes/trimming_paper
fix trim