deleted:    .tester.py.swp
	modified:   plotter
Merge branch 'master' of https://github.com/cranon/gcm-1d

Conflicts:
	plotter

	modified:   body1.txt
	modified:   plotter
	modified:   src/Node.cpp