Fixing merge

CMakeLists.txt

src/CMakeLists.txt

src/Draw/DrawCircle.hpp

src/Draw/DrawSphere.hpp

src/FiniteDifference/Eno_Weno.hpp

src/level_set/redistancing_Sussman/ComputeGradient.hpp

src/level_set/redistancing_Sussman/GaussFilter.hpp

src/level_set/redistancing_Sussman/HelpFunctions.hpp

src/level_set/redistancing_Sussman/HelpFunctionsForGrid.hpp

src/level_set/redistancing_Sussman/NarrowBand.hpp

src/level_set/redistancing_Sussman/RedistancingSussman.hpp