+diffpdf
Merge branch 'master' of https://github.com/cben/myenv

Conflicts:
	machine.sh