test
no changes
Merge branch 'master' of https://github.com/ProfessorBrunner/rc3-sdss

Conflicts:
	pipeline_final/r/raw/frame-r-005640-6-0230.fits
	pipeline_final/rc3_updated.txt