editing files
merge
work on Calibration program and calibration values