Fixing conflict

.gitignore

CHANGELOG.md

Makefile.am

autogen.sh

build_pdata.sh

configure.ac

example/Grid/0_simple/main.cpp

example/Grid/1_stencil/main.cpp

example/Numerics/Agent_sim/Makefile

example/Numerics/Agent_sim/main.cpp

example/Numerics/PSE/0_Derivative_approx_1D/config.cfg

example/Numerics/PSE/0_Derivative_approx_1D/main.cpp

example/Numerics/PSE/1_Derivative_approx_1D_mp/Makefile

example/Numerics/PSE/1_Derivative_approx_1D_mp/config.cfg

.../Numerics/PSE/1_Derivative_approx_1D_mp/main_float128.cpp

example/Numerics/PSE/1_Diffusion_1D/Makefile

example/Numerics/PSE/1_Diffusion_1D/config.cfg

example/Numerics/PSE/1_Diffusion_1D/main.cpp

example/SE/0_classes/Makefile

example/SE/0_classes/main.cpp