Resolved conflicts

AUTHORS

examples/main.c

src/Makefile.am

src/align.h

src/cell.h

src/const.h

src/cooling.c

src/cooling.h

src/cooling/const_du/cooling.h

src/cooling/const_du/cooling_struct.h

src/cooling/const_lambda/cooling.h

src/cooling/const_lambda/cooling_struct.h

src/cooling/none/cooling.h

src/cooling/none/cooling_struct.h

src/cooling_struct.h

src/engine.c

src/engine.h

src/gravity/Default/gravity_part.h

src/hydro/Default/hydro_part.h

src/hydro/Gadget2/hydro_iact.h