new file:   ex.py
	new file:   biglosclusters.csv
	new file:   ex.txt
Merge branch 'master' of https://github.com/nkern/Caustic
	new file:   2D_calc_stack.py
	new file:   2D_gal_self_stack.py
	new file:   2D_gal_stack.py
	new file:   2D_halos.py
	new file:   2D_part_stack.py
	new file:   3D_calc_stack.py
	new file:   3D_gal_stack.py
	new file:   3D_halos.py
	new file:   3D_part_stack.py
	new file:   Millbig_concentrations.csv
	new file:   Millbig_concentrations.phys_phys.csv
	new file:   Readme.txt
	new file:   cmiller.csv
	new file:   cosmocalc.py
	new file:   flux_caustics.py
	new file:   flux_caustics_ideal.py
	new file:   flux_caustics_nideal.py
	new file:   flux_los_mbeta.py
	new file:   flux_los_mini.py
	new file:   flux_los_mvdisp100.py
	new file:   flux_los_part.py
	new file:   flux_self_stack_pbs.sh
	new file:   flux_stack_recovery.py
	new file:   partcut.py
	new file:   remove.py
	new file:   shiftgapper.py
	new file:   shiftgapper2.py
	new file:   snapzs.csv
	new file:   stack.py
	new file:   stack_class_2D.py
	new file:   stack_class_3D.py
	new file:   vdisp_analysis.py
	deleted:    ex.py
	deleted:    ex.txt
	deleted:    ex2.txt
Merge branch 'master' of github.com:nkern/Caustic