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

Conflicts:
	pipeline/rc3.pyc
	pipeline/rc3Catalog.pyc
	pipeline/rc3_updated.txt