Merge branch 'master' into 'updated_MAC'

...ICs/EAGLE_50_low_res/vrconfig_3dfof_subhalos_SO_hydro.cfg

examples/EAGLE_ICs/README

examples/EAGLE_low_z/EAGLE_12/eagle_12.yml

examples/EAGLE_low_z/EAGLE_25/eagle_25.yml

examples/EAGLE_low_z/EAGLE_50/eagle_50.yml

examples/EAGLE_low_z/EAGLE_6/eagle_6.yml

examples/QuickLymanAlpha/L050N0752/qla_50.yml

examples/main.c

examples/main_fof.c

examples/parameter_example.yml

src/Makefile.am

src/black_holes/Default/black_holes.h

src/black_holes/Default/black_holes_iact.h

src/black_holes/EAGLE/black_holes.h

src/black_holes/EAGLE/black_holes_iact.h

src/black_holes/EAGLE/black_holes_io.h

src/black_holes/EAGLE/black_holes_parameters.h

src/black_holes/EAGLE/black_holes_part.h

src/black_holes/EAGLE/black_holes_properties.h

src/cooling/EAGLE/cooling_io.h