working on pslx
Merge branch 'master' of https://github.com/macmanes/trimming_paper

Conflicts:
	trim.mk