Merge branch 'master' into gear_star_formation

.gitignore

doc/Doxyfile.in

examples/Cooling/CoolingBox/coolingBox.yml

examples/Cooling/CoolingBox/energy_plot.py

examples/Cooling/CoolingBox/makeIC.py

examples/Cooling/CoolingBox/plotEnergy.py

examples/Cooling/CoolingBox/run.sh

examples/Cooling/CoolingRates/Makefile.am

examples/Cooling/CoolingRates/cooling_rates.c

examples/EAGLE_ICs/EAGLE_12/run.sh

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/GEAR/DwarfGalaxy/dwarf_galaxy.yml

...edGalaxy/IsolatedGalaxy_starformation/isolated_galaxy.yml

...olatedGalaxy/IsolatedGalaxy_starformation/plotSolution.py

examples/Makefile.am

...CosmoVolume/SmallCosmoVolume_cooling/plotTempEvolution.py

examples/SmallCosmoVolume/SmallCosmoVolume_cooling/run.sh