yolo
fix merge
Merge branch 'restructure_project' of github.com:adrn/PTF into restructure_project
Merge branch 'restructure_project' of github.com:adrn/PTF into restructure_project
add bit for spectra
Merge branch 'restructure_project' of github.com:adrn/PTF into restructure_project