notes
Merge branch 'master' of github.com:dstndstn/tractor

Conflicts:
	projects/desi/decals-plot.py