Updated code
Updated code
New HR3 notes
Merge branch 'master' of https://github.com/forero/SparseFilaments

Conflicts:
	code/xiaodongscript/src/Makefile
	code/xiaodongscript/src/ap_chisq.f90
	code/xiaodongscript/src/ap_grad_fields.f90
	code/xiaodongscript/src/ap_grids.f90
	code/xiaodongscript/src/ap_main_calc_grad_chisqs.f90
	code/xiaodongscript/src/ap_main_test.f90
	code/xiaodongscript/src/ap_settings_init.f90
	code/xiaodongscript/src/ap_smooth.f90