* field change
Merge branch 'master' of https://github.com/gypaos/GRUscripts

Conflicts:
	calibration.txt
	testViGru.C