Commit before merge

src/ErrorFunction/ErrorFunctions.cpp

src/ErrorFunction/ErrorFunctions.h

src/Solvers/DESolver.cpp

src/net_test_3.cpp

src/net_test_ode_1.cpp