fix merge;

.gitignore

core_tools.egg-info/PKG-INFO

core_tools.egg-info/SOURCES.txt

core_tools.egg-info/dependency_links.txt

core_tools.egg-info/top_level.txt

...keysight_videomaps/data_getter/scan_generator_Keysight.py

core_tools/GUI/keysight_videomaps/liveplotting.py

core_tools/GUI/param_viewer/param_viewer_GUI_main.py

core_tools/GUI/virt_gate_matrix/virt_gate_matrix_main.py

core_tools/HVI/AWG_parallel_test_no_dig/HVI_single_shot.py

core_tools/HVI/AWG_parallel_test_no_dig/__init__.py

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

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

...HVI/AWG_parallel_test_no_dig/single_shot_alike.HVIprj.bak

core_tools/HVI/__pycache__/__init__.cpython-36.pyc

core_tools/HVI/__pycache__/__init__.cpython-37.pyc

.../charge_stability_diagram/HVI_charge_stability_diagram.py

...m/__pycache__/HVI_charge_stability_diagram.cpython-36.pyc

...m/__pycache__/HVI_charge_stability_diagram.cpython-37.pyc

...rge_stability_diagram/__pycache__/__init__.cpython-36.pyc