Merge remote-tracking branch 'origin/butterflies'

.gitignore

CMakeLists.txt

src/CMakeLists.txt

src/cats/CMakeLists.txt

src/cats/actions/action_overlay_update.c

src/cats/actions/action_population_grid_output.c

src/cats/actions/process_inter_period_survival.c

src/cats/actions/process_seed_dispersal.c

src/cats/actions/setup.c

src/cats/actions/setup_actions.c

src/cats/cats.c

src/cats/cats_global.h

src/cats/command_line/command_line_options.c

src/cats/command_line/command_line_options.h

src/cats/configuration/check_configuration.c

src/cats/configuration/configuration.c

src/cats/configuration/configuration.h

src/cats/configuration/load_configuration.c

src/cats/configuration/load_configuration_general.c

src/cats/configuration/load_configuration_glm.c