modified:   body1.txt
Merge branch 'master' of https://github.com/cranon/gcm-1d

Conflicts:
	body1.txt

	modified:   body1.txt
	modified:   plotter
	modified:   src/Mesh.h
	modified:   src/calculators/Approximator.cpp
	modified:   src/calculators/NumMethod.cpp
	modified:   body1.txt
	modified:   plotter
	modified:   src/Parser.cpp