modified:   body1.txt
	modified:   launcher.py
	modified:   plotter
	modified:   src/Body.cpp
	modified:   src/Mesh.cpp
	modified:   src/Node.cpp
	modified:   src/Node.h
	modified:   src/Parser.cpp
	modified:   src/Scene.cpp
	modified:   src/calculators/NumMethod.cpp
	modified:   src/calculators/NumMethod.h
Merge branch 'master' of https://github.com/cranon/gcm-1d

Conflicts:
	body1.txt
	plotter
	src/Mesh.cpp

	modified:   body1.txt
	modified:   src/calculators/Approximator.cpp
	modified:   src/calculators/NumMethod.cpp