fix merge

.gitignore

core_tools/GUI/virt_gate_matrix/virt_gate_matrix_main.py

core_tools/HVI/AWG_parallel_test_no_dig/HVI_single_shot.py

..._tools/HVI/AWG_parallel_test_no_dig/single_shot_alike.HVI

...ls/HVI/AWG_parallel_test_no_dig/single_shot_alike.HVI.bak

...ols/HVI/AWG_parallel_test_no_dig/single_shot_alike.HVIprj

.../charge_stability_diagram/HVI_charge_stability_diagram.py

core_tools/HVI/single_shot_exp/HVI_single_shot.HVI

core_tools/HVI/single_shot_exp/HVI_single_shot.HVIprj

core_tools/HVI/single_shot_exp/HVI_single_shot.py

...ingle_shot_exp/__pycache__/HVI_single_shot.cpython-37.pyc

core_tools/drivers/M3102_firmware_loader.py

core_tools/job_mgnt/calibrations/calib_examples/SD_cal.py

...ols/job_mgnt/calibrations/calib_examples/fit_functions.py

...tools/job_mgnt/calibrations/calib_examples/run_example.py

...mgnt/calibrations/calib_examples/transition_line_detct.py

...s/job_mgnt/calibrations/calib_examples/virtual_station.py

core_tools/job_mgnt/calibrations/calibration_single.py

core_tools/job_mgnt/calibrations/data/__init__.py

core_tools/job_mgnt/calibrations/data/calibration_data.py