commit on bigdog data merge conflict
Merge branch 'master' of https://github.com/ProfessorBrunner/rc3-sdss

Conflicts:
	Paper/flux_preservation_check/flux_preserved.py
changes to books preservation code