changes to catalog maker
Merge branch 'master' of github.com:ameert/astro_image_processing

Conflicts:
	flagging/catalog_flags/flag_table.py
	flagging/catalog_flags/table_tex.tex