modified:   .gitignore
	modified:   body1.txt
	modified:   plotter
	modified:   src/Body.cpp
	modified:   src/Body.h
	modified:   src/calculators/NumMethod.cpp
	modified:   src/calculators/NumMethod.h
	modified:   tester.py
Merge branch 'master' of https://github.com/cranon/gcm-1d

Conflicts:
	.tester.py.swp
	body1.txt

	modified:   body1.txt
	new file:   layersTester.py
	modified:   plotter
	modified:   src/Node.cpp
	modified:   src/Parser.cpp
	modified:   src/Scene.cpp